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/edf953d9 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/edf953d9 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/edf953d9 Branch: refs/heads/master Commit: edf953d910e5d089698bd3b8ab06a45c51918cdb Parents: 580a6ab eaa7592 Author: Jean-Baptiste Onofré <[email protected]> Authored: Fri Jul 3 10:00:36 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> 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(-) ----------------------------------------------------------------------
