Branch: refs/heads/master
Home: https://github.com/jenkinsci/configuration-as-code-plugin
Commit: 9cc1a869b6a101c925d9b3a9d1cafa08ede9a600
https://github.com/jenkinsci/configuration-as-code-plugin/commit/9cc1a869b6a101c925d9b3a9d1cafa08ede9a600
Author: Rick <[email protected]>
Date: 2021-09-14 (Tue, 14 Sep 2021)
Changed paths:
M README.md
A docs/features/mergeStrategy.md
M plugin/src/main/java/io/jenkins/plugins/casc/ConfigurationContext.java
A
plugin/src/main/java/io/jenkins/plugins/casc/ConfiguratorConflictException.java
A
plugin/src/main/java/io/jenkins/plugins/casc/yaml/ErrorOnConflictMergeStrategy.java
A plugin/src/main/java/io/jenkins/plugins/casc/yaml/MergeStrategy.java
A plugin/src/main/java/io/jenkins/plugins/casc/yaml/MergeStrategyAction.java
A
plugin/src/main/java/io/jenkins/plugins/casc/yaml/MergeStrategyFactory.java
A
plugin/src/main/java/io/jenkins/plugins/casc/yaml/OverrideMergeStrategy.java
M plugin/src/main/java/io/jenkins/plugins/casc/yaml/YamlUtils.java
A
plugin/src/test/java/io/jenkins/plugins/casc/yaml/ErrorOnConflictMergeStrategyTest.java
A
plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyActionTest.java
A plugin/src/test/java/io/jenkins/plugins/casc/yaml/MergeStrategyTest.java
A
plugin/src/test/java/io/jenkins/plugins/casc/yaml/OverrideMergeStrategyTest.java
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/conflicts.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/incompatible.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/normal.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/overwrite.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/sequence-a.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/sequence-b.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/systemMessage-a.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/systemMessage-b.yml
A plugin/src/test/resources/io/jenkins/plugins/casc/yaml/unknown.yml
Log Message:
-----------
Add a merge strategy extension point for the YAML config (#1218)
Co-authored-by: Tim Jacomb <[email protected]>
Co-authored-by: Joseph Petersen <[email protected]>
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/configuration-as-code-plugin/push/refs/heads/master/d79d07-9cc1a8%40github.com.
