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 BD45518B11 for ; Wed, 20 Jan 2016 03:08:08 +0000 (UTC) Received: (qmail 41024 invoked by uid 500); 20 Jan 2016 03:08:08 -0000 Delivered-To: apmail-karaf-commits-archive@karaf.apache.org Received: (qmail 40948 invoked by uid 500); 20 Jan 2016 03:08:08 -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 40933 invoked by uid 99); 20 Jan 2016 03:08:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Jan 2016 03:08:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 269A1DFBAF; Wed, 20 Jan 2016 03:08:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ffang@apache.org To: commits@karaf.apache.org Date: Wed, 20 Jan 2016 03:08:09 -0000 Message-Id: In-Reply-To: <5d1e1949939f42b3a9f766023645c62e@git.apache.org> References: <5d1e1949939f42b3a9f766023645c62e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] karaf git commit: Merge branch 'karaf-4270-npe-help' of https://github.com/bimargulies/karaf Merge branch 'karaf-4270-npe-help' of https://github.com/bimargulies/karaf Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e6a21e20 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e6a21e20 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e6a21e20 Branch: refs/heads/master Commit: e6a21e20e85f6dfe0561816af1398c3f2dc20334 Parents: d413eef 5a00ab7 Author: Freeman Fang Authored: Wed Jan 20 11:05:49 2016 +0800 Committer: Freeman Fang Committed: Wed Jan 20 11:05:49 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/karaf/shell/compat/CommandTracker.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ----------------------------------------------------------------------