Skip to content

[7.x] [esArchiver] drop support for --dir, use repo-relative paths instead (#101345)#101676

Merged
spalger merged 7 commits intoelastic:7.xfrom
spalger:backport/7.x/pr-101345
Jun 9, 2021
Merged

[7.x] [esArchiver] drop support for --dir, use repo-relative paths instead (#101345)#101676
spalger merged 7 commits intoelastic:7.xfrom
spalger:backport/7.x/pr-101345

Conversation

@spalger
Copy link
Contributor

@spalger spalger commented Jun 8, 2021

Backports the following commits to 7.x:

…lastic#101345)

Co-authored-by: spalger <spalger@users.noreply.github.com>
# Conflicts:
#	test/api_integration/apis/suggestions/suggestions.js
#	test/functional/apps/discover/_large_string.ts
#	test/functional/apps/visualize/index.ts
#	x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
#	x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions_6.x_7.x.ts
#	x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
@spalger spalger added the backport This PR is a backport of another PR label Jun 8, 2021
@spalger spalger enabled auto-merge (squash) June 8, 2021 21:44
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

@spalger spalger merged commit bcdeccb into elastic:7.x Jun 9, 2021
@spalger spalger deleted the backport/7.x/pr-101345 branch June 9, 2021 14:19
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