Merge branch 'karaf-2.x' of https://git-wip-us.apache.org/repos/asf/karaf into karaf-2.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a5c293eb Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a5c293eb Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a5c293eb Branch: refs/heads/karaf-2.x Commit: a5c293eb0500b191c1cb734fdf6b9f3eaa72e3de Parents: 9728ce5 9624787 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Sep 9 18:34:27 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Sep 9 18:34:27 2014 +0200 ---------------------------------------------------------------------- assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | 2 +- .../apache-karaf/src/main/distribution/windows-text/bin/karaf.bat | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/admin | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/admin.bat | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/client.bat | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/shell | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/shell.bat | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
