Branch: refs/heads/master
Home: https://github.com/jenkinsci/configuration-as-code-plugin
Commit: bdf0f0f47fea6d7641fc9741113ac4293409fee7
https://github.com/jenkinsci/configuration-as-code-plugin/commit/bdf0f0f47fea6d7641fc9741113ac4293409fee7
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2018-05-11 (Fri, 11 May 2018)
Changed paths:
M src/main/java/org/jenkinsci/plugins/casc/ConfigurationAsCode.java
A src/main/java/org/jenkinsci/plugins/casc/yaml/YamlReader.java
A src/main/java/org/jenkinsci/plugins/casc/yaml/YamlSource.java
A src/main/java/org/jenkinsci/plugins/casc/yaml/YamlUtils.java
M src/test/java/org/jenkinsci/plugins/casc/ConfigurationAsCodeTest.java
M src/test/java/org/jenkinsci/plugins/casc/DockerCloudTest.java
M
src/test/java/org/jenkinsci/plugins/casc/JobDslGlobaSecurityConfigurationTest.java
M src/test/java/org/jenkinsci/plugins/casc/misc/ConfiguredWithCode.java
M
src/test/java/org/jenkinsci/plugins/casc/misc/JenkinsConfiguredWithCodeRule.java
R src/test/java/org/jenkinsci/plugins/casc/misc/TestConfiguration.java
A src/test/resources/org/jenkinsci/plugins/casc/merge1.yml
A src/test/resources/org/jenkinsci/plugins/casc/merge2.yml
A src/test/resources/org/jenkinsci/plugins/casc/merge3.yml
Log Message:
-----------
merge yaml trees before applying configuration #184
Signed-off-by: Nicolas De Loof <nicolas.del...@gmail.com>
Commit: 18f91bdca9f96c72300f57e459c183796725251e
https://github.com/jenkinsci/configuration-as-code-plugin/commit/18f91bdca9f96c72300f57e459c183796725251e
Author: Nicolas De Loof <nicolas.del...@gmail.com>
Date: 2018-05-11 (Fri, 11 May 2018)
Changed paths:
M src/test/java/org/jenkinsci/plugins/casc/ConfigurationAsCodeTest.java
M src/test/resources/org/jenkinsci/plugins/casc/merge1.yml
M src/test/resources/org/jenkinsci/plugins/casc/merge3.yml
Log Message:
-----------
use the same merge sample as reported in issue
Signed-off-by: Nicolas De Loof <nicolas.del...@gmail.com>
Compare:
https://github.com/jenkinsci/configuration-as-code-plugin/compare/2b45fd6392ab...18f91bdca9f9
**NOTE:** This service been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
--
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 jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
