Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 68ED29579 for ; Mon, 27 Feb 2012 21:48:38 +0000 (UTC) Received: (qmail 29378 invoked by uid 500); 27 Feb 2012 21:48:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 29344 invoked by uid 500); 27 Feb 2012 21:48:38 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 29334 invoked by uid 99); 27 Feb 2012 21:48:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 21:48:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Feb 2012 21:48:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2F8B5813679; Mon, 27 Feb 2012 21:48:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: xedin@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: merge from 1.1 Message-Id: <20120227214815.2F8B5813679@tyr.zones.apache.org> Date: Mon, 27 Feb 2012 21:48:15 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/trunk a91b258dc -> 11965bca1 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/11965bca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11965bca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11965bca Branch: refs/heads/trunk Commit: 11965bca182bbd7a80d750ce80653967e6ecb25e Parents: a91b258 8f81f3d Author: Pavel Yaskevich Authored: Tue Feb 28 00:46:53 2012 +0300 Committer: Pavel Yaskevich Committed: Tue Feb 28 00:46:53 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 4 ++++ 2 files changed, 5 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/11965bca/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------