Merge branch 'KARAF-4340' of https://github.com/lburgazzoli/apache-karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/cd299666 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/cd299666 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/cd299666 Branch: refs/heads/master Commit: cd29966654f45a4d6972093174af42aeb60d715e Parents: 031c8ab 58f4564 Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Feb 17 13:29:53 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Feb 17 13:29:53 2016 +0100 ---------------------------------------------------------------------- .../bin/contrib/karaf-service-template.conf | 2 +- .../bin/contrib/karaf-service-template.init | 49 +++++----- .../contrib/karaf-service-template.init-debian | 26 +++-- .../contrib/karaf-service-template.init-redhat | 40 ++++---- .../resources/bin/contrib/karaf-service.sh | 99 ++++++++++---------- .../base/src/main/resources/resources/bin/karaf | 2 +- 6 files changed, 116 insertions(+), 102 deletions(-) ----------------------------------------------------------------------
