[12/19] git commit: Merge branch 'master' into doc

[jbonofre]

Merge branch 'master' into doc


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2b970c8c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2b970c8c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2b970c8c

Branch: refs/heads/master
Commit: 2b970c8c1d3fcdb95bf3c3f64134e3440e6489ba
Parents: 384540d e00f8d4
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Thu Dec 19 07:07:19 2013 +0100
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Thu Dec 19 07:07:19 2013 +0100

----------------------------------------------------------------------
 .../resources/resources/etc/system.properties   |   2 +-
 .../features/FeatureDeploymentListener.java     | 142 ++++++++++---------
 .../instance/resources/etc/system.properties    |   2 +-
 .../org/apache/karaf/shell/ssh/SshUtils.java    |  99 +++++++++++++
 .../resources/OSGI-INF/blueprint/shell-ssh.xml  |  12 ++
 5 files changed, 190 insertions(+), 67 deletions(-)
----------------------------------------------------------------------