You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by pa...@apache.org on 2019/08/22 06:29:32 UTC

[sling-slingfeature-maven-plugin] 01/01: Merge pull request #36 from apache/issues/SLING-8647

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

pauls pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git

commit 74b1aa776d7e6176bb2fbc46fb191b266ebe5013
Merge: a19ec52 86a3039
Author: Karl Pauls <pa...@apache.org>
AuthorDate: Thu Aug 22 08:29:27 2019 +0200

    Merge pull request #36 from apache/issues/SLING-8647
    
    SLING-8647: Provide policies for configuration merging

 pom.xml                                              |  2 +-
 .../apache/sling/feature/maven/mojos/Aggregate.java  | 20 ++++++++++++++++++--
 .../feature/maven/mojos/AggregateFeaturesMojo.java   |  2 ++
 .../maven/mojos/AggregateFeaturesMojoTest.java       |  1 +
 4 files changed, 22 insertions(+), 3 deletions(-)