rebase fixes and commit filename case changes

elastic · Feb 19, 2020 · 7074e7b · 7074e7b
1 parent 8beab5e
commit 7074e7b
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 2 deletions.
diff --git a/...gacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts b/...gacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts
@@ -5,7 +5,7 @@
  */
 import { Location } from 'history';
 import { getSections } from '../sections';
-import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction';
+import { Transaction } from '../../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import { AppMountContextBasePath } from '../../../../context/ApmPluginContext';
 
 describe('Transaction action menu', () => {

diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
@@ -8,7 +8,7 @@ import { Location } from 'history';
 import { pick, isEmpty } from 'lodash';
 import moment from 'moment';
 import url from 'url';
-import { Transaction } from '../../../../typings/es_schemas/ui/Transaction';
+import { Transaction } from '../../../../../../../plugins/apm/typings/es_schemas/ui/transaction';
 import { IUrlParams } from '../../../context/UrlParamsContext/types';
 import { getDiscoverHref } from '../Links/DiscoverLinks/DiscoverLink';
 import { getDiscoverQuery } from '../Links/DiscoverLinks/DiscoverTransactionLink';

diff --git a/...ypings/es_schemas/raw/fields/Container.ts → ...ypings/es_schemas/raw/fields/container.ts b/...ypings/es_schemas/raw/fields/Container.ts → ...ypings/es_schemas/raw/fields/container.ts
diff --git a/...apm/typings/es_schemas/raw/fields/Host.ts → ...apm/typings/es_schemas/raw/fields/host.ts b/...apm/typings/es_schemas/raw/fields/Host.ts → ...apm/typings/es_schemas/raw/fields/host.ts
diff --git a/...apm/typings/es_schemas/raw/fields/Http.ts → ...apm/typings/es_schemas/raw/fields/http.ts b/...apm/typings/es_schemas/raw/fields/Http.ts → ...apm/typings/es_schemas/raw/fields/http.ts
diff --git a/...pings/es_schemas/raw/fields/Kubernetes.ts → ...pings/es_schemas/raw/fields/kubernetes.ts b/...pings/es_schemas/raw/fields/Kubernetes.ts → ...pings/es_schemas/raw/fields/kubernetes.ts
diff --git a/...apm/typings/es_schemas/raw/fields/Page.ts → ...apm/typings/es_schemas/raw/fields/page.ts b/...apm/typings/es_schemas/raw/fields/Page.ts → ...apm/typings/es_schemas/raw/fields/page.ts
diff --git a/.../typings/es_schemas/raw/fields/Process.ts → .../typings/es_schemas/raw/fields/process.ts b/.../typings/es_schemas/raw/fields/Process.ts → .../typings/es_schemas/raw/fields/process.ts
diff --git a/.../typings/es_schemas/raw/fields/Service.ts → .../typings/es_schemas/raw/fields/service.ts b/.../typings/es_schemas/raw/fields/Service.ts → .../typings/es_schemas/raw/fields/service.ts
diff --git a/...pings/es_schemas/raw/fields/Stackframe.ts → ...pings/es_schemas/raw/fields/stackframe.ts b/...pings/es_schemas/raw/fields/Stackframe.ts → ...pings/es_schemas/raw/fields/stackframe.ts
diff --git a/.../apm/typings/es_schemas/raw/fields/Url.ts → .../apm/typings/es_schemas/raw/fields/url.ts b/.../apm/typings/es_schemas/raw/fields/Url.ts → .../apm/typings/es_schemas/raw/fields/url.ts
diff --git a/...apm/typings/es_schemas/raw/fields/User.ts → ...apm/typings/es_schemas/raw/fields/user.ts b/...apm/typings/es_schemas/raw/fields/User.ts → ...apm/typings/es_schemas/raw/fields/user.ts
diff --git a/...apm/typings/es_schemas/ui/fields/Agent.ts → ...apm/typings/es_schemas/ui/fields/agent.ts b/...apm/typings/es_schemas/ui/fields/Agent.ts → ...apm/typings/es_schemas/ui/fields/agent.ts