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 06E5BD121 for ; Tue, 5 Mar 2013 03:24:08 +0000 (UTC) Received: (qmail 3443 invoked by uid 500); 5 Mar 2013 03:24:07 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3407 invoked by uid 500); 5 Mar 2013 03:24:07 -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 3380 invoked by uid 99); 5 Mar 2013 03:24:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 03:24:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 000C0314CB5; Tue, 5 Mar 2013 03:24:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130305032406.000C0314CB5@tyr.zones.apache.org> Date: Tue, 5 Mar 2013 03:24:05 +0000 (UTC) Updated Branches: refs/heads/trunk 0ce9220a5 -> c97d9ca38 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c97d9ca3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c97d9ca3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c97d9ca3 Branch: refs/heads/trunk Commit: c97d9ca3869200f48e40aa931eefd2f5c7f0e289 Parents: 0ce9220 ccc5971 Author: Aleksey Yeschenko Authored: Tue Mar 5 06:23:22 2013 +0300 Committer: Aleksey Yeschenko Committed: Tue Mar 5 06:23:22 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cli/CliClient.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c97d9ca3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c97d9ca3/src/java/org/apache/cassandra/cli/CliClient.java ----------------------------------------------------------------------