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:31 UTC
[sling-slingfeature-maven-plugin] branch master updated (a19ec52 ->
74b1aa7)
This is an automated email from the ASF dual-hosted git repository.
pauls pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git.
from a19ec52 Update README.md
add e27b9af SLING-8647: Provide policies for configuration merging
add 86a3039 Make the config override ordered and a list to allow stars in the key
new 74b1aa7 Merge pull request #36 from apache/issues/SLING-8647
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
[sling-slingfeature-maven-plugin] 01/01: Merge pull request #36
from apache/issues/SLING-8647
Posted by pa...@apache.org.
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(-)