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 E244810EC7 for ; Wed, 23 Oct 2013 14:17:29 +0000 (UTC) Received: (qmail 96079 invoked by uid 500); 23 Oct 2013 14:17:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95942 invoked by uid 500); 23 Oct 2013 14:17:25 -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 95884 invoked by uid 99); 23 Oct 2013 14:17:23 -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, 23 Oct 2013 14:17:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C47F319610; Wed, 23 Oct 2013 14:17:23 +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 Date: Wed, 23 Oct 2013 14:17:26 -0000 Message-Id: In-Reply-To: <0edf73eafc3742e4849c284b04b1e789@git.apache.org> References: <0edf73eafc3742e4849c284b04b1e789@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/322f9a98 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/322f9a98 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/322f9a98 Branch: refs/heads/trunk Commit: 322f9a98315aabd8a57b6fe42d5763f9ff6de3a7 Parents: 86b26b6 62e8804 Author: Sylvain Lebresne Authored: Wed Oct 23 16:17:02 2013 +0200 Committer: Sylvain Lebresne Committed: Wed Oct 23 16:17:02 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../apache/cassandra/db/RangeTombstoneList.java | 226 ++++++++----------- .../cassandra/db/RangeTombstoneListTest.java | 31 ++- 3 files changed, 125 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/322f9a98/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1df6ade,44eb25d..47e52f1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -5,38 -3,10 +5,40 @@@ Merged from 1.2 * Fix altering column types (CASSANDRA-6185) * cqlsh: fix CREATE/ALTER WITH completion (CASSANDRA-6196) * add windows bat files for shell commands (CASSANDRA-6145) - + * Fix potential stack overflow during range tombstones insertion (CASSANDRA-6181) + + -1.2.11 +2.0.2 + * Update FailureDetector to use nanontime (CASSANDRA-4925) + * Fix FileCacheService regressions (CASSANDRA-6149) + * Never return WriteTimeout for CL.ANY (CASSANDRA-6032) + * Fix race conditions in bulk loader (CASSANDRA-6129) + * Add configurable metrics reporting (CASSANDRA-4430) + * drop queries exceeding a configurable number of tombstones (CASSANDRA-6117) + * Track and persist sstable read activity (CASSANDRA-5515) + * Fixes for speculative retry (CASSANDRA-5932) + * Improve memory usage of metadata min/max column names (CASSANDRA-6077) + * Fix thrift validation refusing row markers on CQL3 tables (CASSANDRA-6081) + * Fix insertion of collections with CAS (CASSANDRA-6069) + * Correctly send metadata on SELECT COUNT (CASSANDRA-6080) + * Track clients' remote addresses in ClientState (CASSANDRA-6070) + * Create snapshot dir if it does not exist when migrating + leveled manifest (CASSANDRA-6093) + * make sequential nodetool repair the default (CASSANDRA-5950) + * Add more hooks for compaction strategy implementations (CASSANDRA-6111) + * Fix potential NPE on composite 2ndary indexes (CASSANDRA-6098) + * Delete can potentially be skipped in batch (CASSANDRA-6115) + * Allow alter keyspace on system_traces (CASSANDRA-6016) + * Disallow empty column names in cql (CASSANDRA-6136) + * Use Java7 file-handling APIs and fix file moving on Windows (CASSANDRA-5383) + * Save compaction history to system keyspace (CASSANDRA-5078) + * Fix NPE if StorageService.getOperationMode() is executed before full startup (CASSANDRA-6166) + * CQL3: support pre-epoch longs for TimestampType (CASSANDRA-6212) + * Add reloadtriggers command to nodetool (CASSANDRA-4949) + * cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139) + * Fix sstable loader (CASSANDRA-6205) +Merged from 1.2: + * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) * Add a warning for small LCS sstable size (CASSANDRA-6191) * Add ability to list specific KS/CF combinations in nodetool cfstats (CASSANDRA-4191) * Mark CF clean if a mutation raced the drop and got it marked dirty (CASSANDRA-5946) http://git-wip-us.apache.org/repos/asf/cassandra/blob/322f9a98/src/java/org/apache/cassandra/db/RangeTombstoneList.java ----------------------------------------------------------------------