Merge branch 'KARAF-4371' 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/8dd819e3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8dd819e3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8dd819e3 Branch: refs/heads/master Commit: 8dd819e3da44b8f15b8d7d169e38bbb3ac344662 Parents: 090921a f8b76c0 Author: Freeman Fang <[email protected]> Authored: Wed Mar 2 15:11:55 2016 +0800 Committer: Freeman Fang <[email protected]> Committed: Wed Mar 2 15:11:55 2016 +0800 ---------------------------------------------------------------------- .../filtered-resources/resources/bin/client | 20 ++++++++++---------- .../filtered-resources/resources/bin/instance | 20 ++++++++++---------- .../main/filtered-resources/resources/bin/shell | 20 ++++++++++---------- .../base/src/main/resources/resources/bin/karaf | 20 ++++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
