[sling-org-apache-sling-validation-core] branch master updated: SLING-7352 allow merging with slingstart by using the same feature name

[kw...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-validation-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 7699864  SLING-7352 allow merging with slingstart by using the same feature name
7699864 is described below

commit 76998647c1b81eb4adc55aef2acfad6f5c624694
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Thu Jan 4 08:52:29 2018 +0100

    SLING-7352 allow merging with slingstart by using the same feature name
---
 src/test/provisioning/model.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/provisioning/model.txt b/src/test/provisioning/model.txt
index 5382e23..6ae8524 100644
--- a/src/test/provisioning/model.txt
+++ b/src/test/provisioning/model.txt
@@ -16,7 +16,9 @@
 #  specific language governing permissions and limitations
 #  under the License.
 #
-[feature name=validation.core.it]
+
+# must be the same feature name as the feature defined in slingstart to allow merging
+[feature name=sling-validation]
 # Dependencies
 [artifacts]
   org.apache.sling/org.apache.sling.launchpad/9/slingstart

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].