Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ec55518a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ec55518a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ec55518a Branch: refs/heads/master Commit: ec55518af3259548c6f94c4ceceb6129bc70ff5b Parents: 818e88d 7678b4d Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Jun 19 14:49:08 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Fri Jun 19 14:49:08 2015 +0200 ---------------------------------------------------------------------- .../enterprise/src/main/feature/feature.xml | 42 ++++++++++++-------- pom.xml | 2 +- 2 files changed, 27 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
