Merge branch 'KARAF-3648-master' of https://github.com/grgrzybek/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/bcc2c696 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/bcc2c696 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/bcc2c696 Branch: refs/heads/master Commit: bcc2c696aceda20fe14ce5c861952b1182e3e115 Parents: e9335df 70c815e Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Jun 18 14:41:55 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Jun 18 14:41:55 2015 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/main/InstanceHelper.java | 24 ++++++++++++++++++++ 1 file changed, 24 insertions(+) ----------------------------------------------------------------------
