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/cc8dfd9e Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cc8dfd9e Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cc8dfd9e Branch: refs/heads/master Commit: cc8dfd9eb5549ee8ffed115a6758d10f9597d30a Parents: 4623069 6862b62 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Jun 21 18:23:09 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Jun 21 18:23:09 2016 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/features/internal/service/Deployer.java | 8 +++++++- pom.xml | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
