Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #11067 to 6.7: Fix a issue when cancelling an enroll. #11186

Merged
merged 2 commits into from
Mar 13, 2019

Conversation

ph
Copy link
Contributor

@ph ph commented Mar 11, 2019

Cherry-pick of PR #11067 to 6.7 branch. Original message:

Fix an issue with a partial enroll, when a user refused to overrides a
local configuration actually the enroll command did already used the
token on the ES cluster, this commit move the confirm in the CM instead
of having it in the Enroll's function and is executed by sending the
token or creating any files on disk.

Fixes: #10150

@ph
Copy link
Contributor Author

ph commented Mar 13, 2019

jenkins test this please

ph added 2 commits March 13, 2019 08:37
Fix an issue with a partial enroll, when a user refused to overrides a
local configuration actually the enroll command did already used the
token on the ES cluster, this commit move the confirm in the CM instead
of having it in the Enroll's function and is executed by sending the
token or creating any files on disk.

Fixes: elastic#10150
(cherry picked from commit 5eb5085)
@ph ph force-pushed the backport_11067_6.7 branch from 0cfe6d5 to f869caf Compare March 13, 2019 12:38
@ph
Copy link
Contributor Author

ph commented Mar 13, 2019

failures unrelated to this commit

@ph ph merged commit 548136b into elastic:6.7 Mar 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants