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 99E8FD41D for ; Mon, 19 Nov 2012 16:55:36 +0000 (UTC) Received: (qmail 2517 invoked by uid 500); 19 Nov 2012 16:55:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 2361 invoked by uid 500); 19 Nov 2012 16:55:35 -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 2241 invoked by uid 99); 19 Nov 2012 16:55:35 -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, 19 Nov 2012 16:55:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 23069314BB3; Mon, 19 Nov 2012 16:55:35 +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/3] git commit: Merge branch 'cassandra-1.2.0' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0 Message-Id: <20121119165535.23069314BB3@tyr.zones.apache.org> Date: Mon, 19 Nov 2012 16:55:35 +0000 (UTC) Merge branch 'cassandra-1.2.0' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83bbd754 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83bbd754 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/83bbd754 Branch: refs/heads/cassandra-1.2 Commit: 83bbd7542262301fd9e35471c598e0c2f7076a3b Parents: f574c95 4f28e6b Author: Sylvain Lebresne Authored: Mon Nov 19 17:53:29 2012 +0100 Committer: Sylvain Lebresne Committed: Mon Nov 19 17:53:29 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql/AlterTableStatement.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/83bbd754/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 72dd52c,69d7dc3..e36bf01 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -15,8 -15,8 +15,9 @@@ * Change stream session ID to UUID to avoid collision from same node (CASSANDRA-4813) * Use Stats.db when bulk loading if present (CASSANDRA-4957) * Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956) + * Remove select arbitrary limit (CASSANDRA-4918) Merged from 1.1: + * fix CQL2 ALTER TABLE compaction_strategy_class altering (CASSANDRA-4965) * reset getRangeSlice filter after finishing a row for get_paged_slice (CASSANDRA-4919) * expunge row cache post-truncate (CASSANDRA-4940)