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 312FEDECA for ; Fri, 7 Dec 2012 17:44:38 +0000 (UTC) Received: (qmail 71816 invoked by uid 500); 7 Dec 2012 17:44:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71775 invoked by uid 500); 7 Dec 2012 17:44:37 -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 71726 invoked by uid 99); 7 Dec 2012 17:44:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Dec 2012 17:44:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DCA4031D2E7; Fri, 7 Dec 2012 17:44:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/10] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121207174436.DCA4031D2E7@tyr.zones.apache.org> Date: Fri, 7 Dec 2012 17:44:36 +0000 (UTC) Merge branch 'cassandra-1.2.0' into cassandra-1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0934bffa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0934bffa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0934bffa Branch: refs/heads/cassandra-1.2 Commit: 0934bffa107cb9c13062a1cfbff986339f622847 Parents: fc416fa 8581be8 Author: Yuki Morishita Authored: Fri Dec 7 11:42:45 2012 -0600 Committer: Yuki Morishita Committed: Fri Dec 7 11:42:45 2012 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cli/CliClient.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------