Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Conflicts:
shell/console/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d030dd79
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d030dd79
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d030dd79
Branch: refs/heads/master
Commit: d030dd7970cf0a048de62d06b3d1da0bf52ae0f8
Parents: 3c87255 523be12
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Thu May 7 10:38:32 2015 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Thu May 7 10:38:32 2015 +0200
----------------------------------------------------------------------
demos/profiles/registry/pom.xml | 26 ++++++++++++++++++++
.../activemq/broker.profile/profile.cfg | 1 +
.../main/resources/default.profile/version.cfg | 8 +++---
shell/console/pom.xml | 2 +-
4 files changed, 32 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
