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-org-apache-sling-feature-launcher.git.
from e9e01ee SLING-8629 : ConfigurationAdmin does not get registered
without configurations
add 98e5a20 SLING-8647: Provide policies for configuration merging
new c893ddb Merge pull request #14 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 +-
.../org/apache/sling/feature/launcher/impl/FeatureProcessor.java | 1 +
.../org/apache/sling/feature/launcher/impl/LauncherConfig.java | 7 +++++++
src/main/java/org/apache/sling/feature/launcher/impl/Main.java | 8 ++++++++
4 files changed, 17 insertions(+), 1 deletion(-)