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/e30810eb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e30810eb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e30810eb Branch: refs/heads/trunk Commit: e30810ebb4f52aca58abc9a2cbfbc766c62aaba4 Parents: ebd50ff de52661 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Oct 22 21:25:34 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Oct 22 21:25:34 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 7 +++-- bin/cqlsh.bat | 5 ++++ bin/debug-cql.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstableloader.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstablemetadata.bat | 33 ++++++++++++++++++++++++ bin/sstablescrub.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstablesplit.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ bin/sstableupgrade.bat | 61 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 348 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e30810eb/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d60cff1,bb40dff..1cb580d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,11 +1,41 @@@ -1.2.12 - * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) +2.0.3 + * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571) - - ++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) - - -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)
