Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f97eeac2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f97eeac2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f97eeac2 Branch: refs/heads/cassandra-2.0 Commit: f97eeac26885187d2dd9634cde040a30434fdcf3 Parents: 854de4e c040759 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Oct 23 10:34:35 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Oct 23 10:34:35 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/ConfigHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f97eeac2/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9f7f3f0,63627e1..ece28ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -7,39 -4,10 +7,40 @@@ Merged from 1.2 * 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) + * (Hadoop) Make LOCAL_ONE the default consistency level (CASSANDRA-6214) -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/f97eeac2/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ----------------------------------------------------------------------