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/67891969 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/67891969 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/67891969 Branch: refs/heads/master Commit: 6789196927345d5be015c34c3e452f2611fa77b5 Parents: d2dfe56 d7de159 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Apr 9 12:05:23 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Apr 9 12:05:23 2014 +0200 ---------------------------------------------------------------------- .../internal/deployment/DeploymentBuilder.java | 5 +- .../internal/service/FeaturesServiceImpl.java | 56 ++++++++++++++++---- 2 files changed, 48 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
