Merge branch 'karaf-3.0.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-3.0.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/61db3552 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/61db3552 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/61db3552 Branch: refs/heads/karaf-3.0.x Commit: 61db3552003daf47c6d81909094e34095a43e9c6 Parents: cb26771 66cc65f Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Aug 20 18:04:06 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Aug 20 18:04:06 2015 +0200 ---------------------------------------------------------------------- .../main/filtered-resources/resources/bin/client | 18 ++++++++++-------- .../filtered-resources/resources/bin/instance | 18 ++++++++++-------- .../main/filtered-resources/resources/bin/shell | 18 ++++++++++-------- .../src/main/resources/resources/bin/karaf | 18 ++++++++++-------- 4 files changed, 40 insertions(+), 32 deletions(-) ----------------------------------------------------------------------
