Skip to content

Conversation

eyalkoren
Copy link
Contributor

@eyalkoren eyalkoren commented Sep 9, 2024

Backport

This will backport the following commits from main to 8.15:

Two comments about the merge:

  1. I merged all changes of EcsDynamicTemplatesIT because some are needed and the coverage is better anyway
  2. I kept the same version of StackTemplateRegistry from the original PR, even though it bumps by two, as it may be easier to track back to what the version change is related to. I think that in terms of functionality it shouldn't matter - upgrade from 8.15.1 to 8.15.2 should trigger components update the same.

Questions ?

Please refer to the Backport tool documentation

…lastic#112444)

(cherry picked from commit 86a3eff)

# Conflicts:
#	x-pack/plugin/stack/src/javaRestTest/java/org/elasticsearch/xpack/stack/EcsDynamicTemplatesIT.java
#	x-pack/plugin/stack/src/main/java/org/elasticsearch/xpack/stack/StackTemplateRegistry.java
@eyalkoren eyalkoren merged commit 781e197 into elastic:8.15 Sep 9, 2024
15 checks passed
@eyalkoren eyalkoren deleted the backport/8.15/pr-112444 branch September 9, 2024 16:16
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.

3 participants