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 B10F1DC79 for ; Mon, 26 Nov 2012 18:23:22 +0000 (UTC) Received: (qmail 40731 invoked by uid 500); 26 Nov 2012 18:23:22 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 40689 invoked by uid 500); 26 Nov 2012 18:23:22 -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 40649 invoked by uid 99); 26 Nov 2012 18:23:22 -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, 26 Nov 2012 18:23:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0B21D319ED0; Mon, 26 Nov 2012 18:23:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/6] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2 Message-Id: <20121126182322.0B21D319ED0@tyr.zones.apache.org> Date: Mon, 26 Nov 2012 18:23:22 +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/6e21cad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e21cad7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e21cad7 Branch: refs/heads/trunk Commit: 6e21cad7115d7df3ee28832ac489b0fc5c529813 Parents: 2f7fbba b44abad Author: Sylvain Lebresne Authored: Mon Nov 26 19:22:58 2012 +0100 Committer: Sylvain Lebresne Committed: Mon Nov 26 19:22:58 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../statements/CreateColumnFamilyStatement.java | 3 +++ .../cassandra/cql3/statements/SelectStatement.java | 5 +++++ 3 files changed, 10 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e21cad7/CHANGES.txt ----------------------------------------------------------------------