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 7369CE756 for ; Mon, 11 Mar 2013 18:17:51 +0000 (UTC) Received: (qmail 54834 invoked by uid 500); 11 Mar 2013 18:17:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 54794 invoked by uid 500); 11 Mar 2013 18:17:51 -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 54782 invoked by uid 99); 11 Mar 2013 18:17:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 18:17:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F3FEEC23C; Mon, 11 Mar 2013 18:17:50 +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: <20130311181750.F3FEEC23C@tyr.zones.apache.org> Date: Mon, 11 Mar 2013 18:17:50 +0000 (UTC) Updated Branches: refs/heads/trunk c65f9e7ed -> 13e0c6357 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/13e0c635 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13e0c635 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13e0c635 Branch: refs/heads/trunk Commit: 13e0c6357778ad5865bd9e1203a4b5d1dd26cd7e Parents: c65f9e7 edc37bc Author: Aleksey Yeschenko Authored: Mon Mar 11 21:17:32 2013 +0300 Committer: Aleksey Yeschenko Committed: Mon Mar 11 21:17:32 2013 +0300 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_cqlsh_output.py | 27 ++++++++------- pylib/cqlshlib/test/test_keyspace_init2.cql | 2 +- pylib/cqlshlib/test/test_keyspace_init3.cql | 40 +++++++++++----------- 3 files changed, 35 insertions(+), 34 deletions(-) ----------------------------------------------------------------------