Skip to content

[7.x] [Upgrade Assistant] Align code between branches (#91862)#92718

Merged
alisonelizabeth merged 2 commits intoelastic:7.xfrom
alisonelizabeth:backport/7.x/pr-91862
Feb 25, 2021
Merged

[7.x] [Upgrade Assistant] Align code between branches (#91862)#92718
alisonelizabeth merged 2 commits intoelastic:7.xfrom
alisonelizabeth:backport/7.x/pr-91862

Conversation

@alisonelizabeth
Copy link
Contributor

Backports the following commits to 7.x:

# Conflicts:
#	x-pack/plugins/translations/translations/ja-JP.json
#	x-pack/plugins/translations/translations/zh-CN.json
#	x-pack/plugins/upgrade_assistant/common/types.ts
#	x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx
#	x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx
#	x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx
#	x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap
#	x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx
#	x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx
#	x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts
#	x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts
#	x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts
#	x-pack/plugins/upgrade_assistant/server/lib/reindexing/types.ts
@alisonelizabeth alisonelizabeth added the backport This PR is a backport of another PR label Feb 24, 2021
@alisonelizabeth alisonelizabeth enabled auto-merge (squash) February 24, 2021 21:35
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

Module Count

Fewer modules leads to a faster build time

id before after diff
upgradeAssistant 120 119 -1

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
upgradeAssistant 139.5KB 134.0KB -5.5KB

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@alisonelizabeth alisonelizabeth merged commit cd9da66 into elastic:7.x Feb 25, 2021
@alisonelizabeth alisonelizabeth deleted the backport/7.x/pr-91862 branch February 25, 2021 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants