[2/2] karaf git commit: Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x

[jbonofre]

Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf 
into karaf-3.0.x


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

Branch: refs/heads/karaf-3.0.x
Commit: 1b9fecbba25ff0f0362a8f9b763c842b2356be89
Parents: ac8b9a3 bfd0db0
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Mon Mar 2 10:46:07 2015 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Mon Mar 2 10:46:07 2015 +0100

----------------------------------------------------------------------
 .../service/guard/impl/GuardProxyCatalog.java   | 30 +++++++++++---------
 .../impl/SecuredCommandConfigTransformer.java   | 11 ++++---
 2 files changed, 23 insertions(+), 18 deletions(-)
----------------------------------------------------------------------