Merge branch 'start-script' of https://github.com/lkiesow/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/64eb20d8 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/64eb20d8 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/64eb20d8 Branch: refs/heads/master Commit: 64eb20d80d1bb89e3af2e3a82c993aacf2a673af Parents: 6b98466 36a609a Author: Jean-Baptiste Onofré <[email protected]> Authored: Sun Apr 17 22:04:55 2016 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sun Apr 17 22:04:55 2016 +0200 ---------------------------------------------------------------------- .../base/src/main/resources/resources/bin/karaf | 342 ++++++++++--------- 1 file changed, 172 insertions(+), 170 deletions(-) ----------------------------------------------------------------------
