Merge branch 'master' into fix_tsvb_split

elastic · Sep 10, 2021 · ee034bf · ee034bf
2 parents edd5f49 + 7da17a5
commit ee034bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/packages/kbn-ui-shared-deps/src/entry.js b/packages/kbn-ui-shared-deps/src/entry.js
@@ -56,3 +56,4 @@ export const KbnStd = require('@kbn/std');
 export const SaferLodashSet = require('@elastic/safer-lodash-set');
 export const RisonNode = require('rison-node');
 export const History = require('history');
+export const Classnames = require('classnames');
diff --git a/packages/kbn-ui-shared-deps/src/index.js b/packages/kbn-ui-shared-deps/src/index.js
@@ -101,6 +101,7 @@ exports.externals = {
   '@elastic/safer-lodash-set': '__kbnSharedDeps__.SaferLodashSet',
   'rison-node': '__kbnSharedDeps__.RisonNode',
   history: '__kbnSharedDeps__.History',
+  classnames: '__kbnSharedDeps__.Classnames',
 };
 
 /**

diff --git a/x-pack/plugins/apm/dev_docs/testing.md b/x-pack/plugins/apm/dev_docs/testing.md
@@ -42,7 +42,7 @@ The API tests are located in `x-pack/test/apm_api_integration/`.
 node scripts/test/e2e [--trial] [--help]
 ```
 
-The E2E tests are located [here](../../ftr_e2e)
+The E2E tests are located [here](../ftr_e2e)
 
 ---
-Original file line number
+Diff line change
@@ Expand Up @@
     node scripts/test/e2e [--trial] [--help]
     ```
-    The E2E tests are located [here](../../ftr_e2e)
+    The E2E tests are located [here](../ftr_e2e)
     ---
@@ Expand Down @@