Skip to content

Commit e5cf562

Browse files
mattkimemattkime
committed
Merge branch 'move_field_mappings_util_to_saved_objects' into index_pattern_edit_field_formatter
2 parents cc16bfa + 7041ddb commit e5cf562

31 files changed

Lines changed: 167 additions & 157 deletions

‎.backportrc.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.10",
67
"7.9",
78
"7.8",
89
"7.7",
@@ -27,7 +28,7 @@
2728
"targetPRLabels": ["backport"],
2829
"branchLabelMapping": {
2930
"^v8.0.0$": "master",
30-
"^v7.10.0$": "7.x",
31+
"^v7.11.0$": "7.x",
3132
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
3233
}
3334
}

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.expandshorthand.md‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec._deserialize.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec._serialize.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.md‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldmappingspec.type.md‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.mappingobject.md‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/development/plugins/data/public/kibana-plugin-plugins-data-public.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
| [DataPublicPluginStartUi](./kibana-plugin-plugins-data-public.datapublicpluginstartui.md) | Data plugin prewired UI components |
6060
| [EsQueryConfig](./kibana-plugin-plugins-data-public.esqueryconfig.md) | |
6161
| [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) | |
62-
| [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) | |
6362
| [IDataPluginServices](./kibana-plugin-plugins-data-public.idatapluginservices.md) | |
6463
| [IEsSearchRequest](./kibana-plugin-plugins-data-public.iessearchrequest.md) | |
6564
| [IFieldSubType](./kibana-plugin-plugins-data-public.ifieldsubtype.md) | |
@@ -108,7 +107,6 @@
108107
| [esFilters](./kibana-plugin-plugins-data-public.esfilters.md) | |
109108
| [esKuery](./kibana-plugin-plugins-data-public.eskuery.md) | |
110109
| [esQuery](./kibana-plugin-plugins-data-public.esquery.md) | |
111-
| [expandShorthand](./kibana-plugin-plugins-data-public.expandshorthand.md) | |
112110
| [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md) | |
113111
| [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) | |
114112
| [fieldList](./kibana-plugin-plugins-data-public.fieldlist.md) | |
@@ -163,7 +161,6 @@
163161
| [ISearch](./kibana-plugin-plugins-data-public.isearch.md) | |
164162
| [ISearchGeneric](./kibana-plugin-plugins-data-public.isearchgeneric.md) | |
165163
| [ISearchSource](./kibana-plugin-plugins-data-public.isearchsource.md) | search source interface |
166-
| [MappingObject](./kibana-plugin-plugins-data-public.mappingobject.md) | |
167164
| [MatchAllFilter](./kibana-plugin-plugins-data-public.matchallfilter.md) | |
168165
| [ParsedInterval](./kibana-plugin-plugins-data-public.parsedinterval.md) | |
169166
| [PhraseFilter](./kibana-plugin-plugins-data-public.phrasefilter.md) | |

‎packages/kbn-pm/dist/index.js‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ function help() {
196196
--oss Do not include the x-pack when running command.
197197
--skip-kibana-plugins Filter all plugins in ./plugins and ../kibana-extra when running command.
198198
--no-cache Disable the bootstrap cache
199+
--no-validate Disable the bootstrap yarn.lock validation
199200
--verbose Set log level to verbose
200201
--debug Set log level to debug
201202
--quiet Set log level to error
@@ -222,9 +223,10 @@ async function run(argv) {
222223
i: 'include'
223224
},
224225
default: {
225-
cache: true
226+
cache: true,
227+
validate: true
226228
},
227-
boolean: ['prefer-offline', 'frozen-lockfile', 'cache']
229+
boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate']
228230
});
229231
const args = options._;
230232

@@ -8998,7 +9000,11 @@ const BootstrapCommand = {
89989000
}
89999001

90009002
const yarnLock = await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__["readYarnLock"])(kbn);
9001-
await Object(_utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__["validateYarnLock"])(kbn, yarnLock);
9003+
9004+
if (options.validate) {
9005+
await Object(_utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__["validateYarnLock"])(kbn, yarnLock);
9006+
}
9007+
90029008
await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_0__["linkProjectExecutables"])(projects, projectGraph);
90039009
/**
90049010
* At the end of the bootstrapping process we call all `kbn:bootstrap` scripts

‎packages/kbn-pm/src/cli.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ function help() {
4747
--oss Do not include the x-pack when running command.
4848
--skip-kibana-plugins Filter all plugins in ./plugins and ../kibana-extra when running command.
4949
--no-cache Disable the bootstrap cache
50+
--no-validate Disable the bootstrap yarn.lock validation
5051
--verbose Set log level to verbose
5152
--debug Set log level to debug
5253
--quiet Set log level to error
@@ -80,8 +81,9 @@ export async function run(argv: string[]) {
8081
},
8182
default: {
8283
cache: true,
84+
validate: true,
8385
},
84-
boolean: ['prefer-offline', 'frozen-lockfile', 'cache'],
86+
boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate'],
8587
});
8688

8789
const args = options._;

0 commit comments

Comments
 (0)