Merge branch 'KARAF-4569' of https://github.com/lburgazzoli/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/46230691 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/46230691 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/46230691 Branch: refs/heads/master Commit: 46230691f7ff35eeb7203d956b575daea8e02245 Parents: 1c6819c cb9a94a Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Jun 21 18:04:11 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Jun 21 18:04:11 2016 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/karaf/main/Main.java | 36 ++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
