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/04fdd4de Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/04fdd4de Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/04fdd4de Branch: refs/heads/master Commit: 04fdd4deda5708bafb9d2ec77a67e32a2d129908 Parents: 81c56a7 7623268 Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Oct 16 12:55:24 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Oct 16 12:55:24 2014 +0200 ---------------------------------------------------------------------- .../karaf/management/KarafMBeanServerGuard.java | 35 ++++++++++++++------ 1 file changed, 25 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
