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 to 7.0: Change add_cloud_metadata to not overwrite cloud field (#11612) #11730

Merged
merged 4 commits into from
Apr 11, 2019
Merged

Cherry-pick to 7.0: Change add_cloud_metadata to not overwrite cloud field (#11612) #11730

merged 4 commits into from
Apr 11, 2019

Conversation

kaiyan-sheng
Copy link
Contributor

  • Change add_cloud_metadata to not overwrite cloud field
  • Add overwrite flag for add_cloud_metadata
  • Add test for cloud.provider: ec2

(cherry picked from commit 17edc90)

* Change add_cloud_metadata to not overwrite cloud field

* Add overwrite flag for add_cloud_metadata

* Add test for cloud.provider: ec2

* Update processors-using.asciidoc

(cherry picked from commit 17edc90)
@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner April 9, 2019 18:06
@exekias
Copy link
Contributor

exekias commented Apr 10, 2019

It seems this is broken, maybe there is a missing backport?

@exekias
Copy link
Contributor

exekias commented Apr 10, 2019

Please don't merge until 7.0 has been released 👍

@kaiyan-sheng
Copy link
Contributor Author

It seems this is broken, maybe there is a missing backport?

@exekias That was my bad, my mistake on resolving conflict. Now it's fixed.

@kaiyan-sheng kaiyan-sheng merged commit 587707d into elastic:7.0 Apr 11, 2019
@kaiyan-sheng kaiyan-sheng deleted the backport_11612_7.0 branch April 11, 2019 12:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants