[48/50] karaf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/karaf

[jbonofre]

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/54b569d3
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/54b569d3
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/54b569d3

Branch: refs/heads/master
Commit: 54b569d3f55c1e140b150e55fe7df175a8823830
Parents: 47e7df3 773290c
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Fri Jul 3 10:00:36 2015 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Fri Jul 3 10:00:36 2015 +0200

----------------------------------------------------------------------
 .../resources/resources/etc/system.properties   |  9 +++++++-
 .../service/guard/impl/GuardProxyCatalog.java   | 24 +++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)
----------------------------------------------------------------------