You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@karaf.apache.org by jb...@apache.org on 2015/07/07 16:13:20 UTC

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

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

Branch: refs/heads/master
Commit: 361e3277320af604d30e7b1521db1eb6d1e341db
Parents: 0d61d7b 98fdda7
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Jul 3 10:00:36 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@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(-)
----------------------------------------------------------------------