Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/44253788 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/44253788 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/44253788 Branch: refs/heads/karaf-2.x Commit: 4425378816c7687cf7fced7111c5aa30f3ff47ed Parents: b726c71 5b80490 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Mar 2 17:14:06 2015 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Mar 2 17:14:06 2015 +0100 ---------------------------------------------------------------------- diagnostic/core/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
