Skip to content

Commit b9ec245

Browse files
elasticmachineelasticmachine
authored
Merge branch 'master' into de_fixes
2 parents 974cd88 + 21156d6 commit b9ec245

59 files changed

Lines changed: 1219 additions & 1597 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/settings/apm-settings.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Changing these settings may disable features of the APM App.
4747
| Set to `false` to hide the APM app from the menu. Defaults to `true`.
4848

4949
| `xpack.apm.ui.transactionGroupBucketSize`
50-
| Number of top transaction groups displayed in the APM app. Defaults to `100`.
50+
| Number of top transaction groups displayed in the APM app. Defaults to `1000`.
5151

5252
| `xpack.apm.ui.maxTraceItems` {ess-icon}
5353
| Maximum number of child items displayed when viewing trace details. Defaults to `1000`.

‎test/functional/apps/saved_objects_management/edit_saved_object.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
6767
};
6868

6969
// Flaky: https://github.com/elastic/kibana/issues/68400
70-
describe('saved objects edition page', () => {
70+
describe.skip('saved objects edition page', () => {
7171
beforeEach(async () => {
7272
await esArchiver.load('saved_objects_management/edit_saved_object');
7373
});

0 commit comments

Comments
 (0)