/[Apache-SVN]

Revision 1684183

Jump to revision:
Author:	cziegeler
Date:	Mon Jun 8 13:45:31 2015 UTC (8 years, 10 months ago)
Changed paths:	10
Log Message:	SLING-4126 : Provide a mechanism to merge configurations

Changed paths

Path	Details
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/package-info.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelUtilityTest.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/U.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/io/IOTest.java	modified , text changed
sling/trunk/tooling/support/provisioning-model/src/test/resources/merge/config-base.txt	added
sling/trunk/tooling/support/provisioning-model/src/test/resources/merge/config-merge.txt	added

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26