This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch karaf-4.4.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
from 8c7b2acdc2 KARAF-7804 - provide unique servlet-name when registering
http proxy servlets
add f84ab0b39a [KARAF-7799] Allow merging of org.apache.karaf.features.xml
definitions
new 6822d75ec4 Merge pull request #1817 from grgrzybek/KARAF-7799-4.4
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:
.../org/apache/karaf/profile/assembly/Builder.java | 30 ++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
