Return-Path: X-Original-To: apmail-karaf-commits-archive@minotaur.apache.org Delivered-To: apmail-karaf-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CBA28105B5 for ; Thu, 19 Dec 2013 14:31:53 +0000 (UTC) Received: (qmail 11359 invoked by uid 500); 19 Dec 2013 14:31:42 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 11111 invoked by uid 500); 19 Dec 2013 14:31:27 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 10705 invoked by uid 99); 19 Dec 2013 14:31:17 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 14:31:17 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C5631EFAB; Thu, 19 Dec 2013 14:31:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org To: commits@karaf.apache.org Date: Thu, 19 Dec 2013 14:31:27 -0000 Message-Id: <233f6420da304cdcbbcf688f7fa8ca7a@git.apache.org> In-Reply-To: <52698a63e32442088024aa81269856c6@git.apache.org> References: <52698a63e32442088024aa81269856c6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/19] git commit: Merge branch 'master' into doc 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é Authored: Thu Dec 19 07:07:19 2013 +0100 Committer: Jean-Baptiste Onofré 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(-) ----------------------------------------------------------------------