This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 7560d1e9697c05f0dc44c5114faa243a5b6fc6d4 Merge: f344691 fcef57c Author: Alex Heneveld <[email protected]> AuthorDate: Wed Feb 20 09:56:31 2019 +0000 Merge branch 'master' into extending-parameter-types api/pom.xml | 5 + camp/camp-server/pom.xml | 12 +- karaf/features/src/main/feature/feature.xml | 6 +- karaf/init/pom.xml | 1 - karaf/start/pom.xml | 1 - launcher/pom.xml | 20 --- parent/pom.xml | 189 ++++++++++++++-------------- pom.xml | 10 +- rest/rest-resources/pom.xml | 2 +- rest/rest-server/pom.xml | 8 -- utils/common/pom.xml | 2 - 11 files changed, 108 insertions(+), 148 deletions(-)
