Merge branch 'master' into de_fixes

elastic · Jul 15, 2020 · b9ec245 · b9ec245
2 parents 974cd88 + 21156d6
commit b9ec245
Show file tree

Hide file tree

Showing 59 changed files with 1,219 additions and 1,597 deletions.
diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -47,7 +47,7 @@ Changing these settings may disable features of the APM App.
   | Set to `false` to hide the APM app from the menu. Defaults to `true`.
 
 | `xpack.apm.ui.transactionGroupBucketSize`
-  | Number of top transaction groups displayed in the APM app. Defaults to `100`.
+  | Number of top transaction groups displayed in the APM app. Defaults to `1000`.
 
 | `xpack.apm.ui.maxTraceItems` {ess-icon}
   | Maximum number of child items displayed when viewing trace details. Defaults to `1000`.

diff --git a/test/functional/apps/saved_objects_management/edit_saved_object.ts b/test/functional/apps/saved_objects_management/edit_saved_object.ts
@@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   };
 
   // Flaky: https://github.com/elastic/kibana/issues/68400
-  describe('saved objects edition page', () => {
+  describe.skip('saved objects edition page', () => {
     beforeEach(async () => {
       await esArchiver.load('saved_objects_management/edit_saved_object');
     });