[2/2] karaf git commit: Merge branch 'master' of https://github.com/dleangen/karaf

[jbonofre]

Merge branch 'master' of https://github.com/dleangen/karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/54b46154
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/54b46154
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/54b46154

Branch: refs/heads/master
Commit: 54b46154c4aff53e46c16a6378eff92c572c2899
Parents: 66eeed5 7df43b1
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Wed Nov 25 11:05:17 2015 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Wed Nov 25 11:05:17 2015 +0100

----------------------------------------------------------------------
 .../region/SubsystemResolveContext.java         | 12 +++++--
 .../internal/resolver/ResourceUtils.java        | 36 ++++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)
----------------------------------------------------------------------