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 77289D533 for ; Wed, 15 May 2013 13:08:14 +0000 (UTC) Received: (qmail 94154 invoked by uid 500); 15 May 2013 13:08:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 94106 invoked by uid 500); 15 May 2013 13:08:14 -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 93887 invoked by uid 99); 15 May 2013 13:08:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 May 2013 13:08:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7F8AFACBF; Wed, 15 May 2013 13:08:13 +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 Date: Wed, 15 May 2013 13:08:14 -0000 Message-Id: In-Reply-To: <239ee8b909f54199a199dad0275c79b6@git.apache.org> References: <239ee8b909f54199a199dad0275c79b6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'cassandra-1.2' into trunk 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/c70740fb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70740fb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70740fb Branch: refs/heads/trunk Commit: c70740fbc41e562fac21baec4ece32449fe3443b Parents: 793d58a 384c27c Author: Aleksey Yeschenko Authored: Wed May 15 16:07:46 2013 +0300 Committer: Aleksey Yeschenko Committed: Wed May 15 16:07:46 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70740fb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70740fb/bin/cqlsh ----------------------------------------------------------------------