Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3418b74b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3418b74b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3418b74b Branch: refs/heads/trunk Commit: 3418b74bce6bdf45cfddd9a0118f139871bfb9dc Parents: d963e9b e30810e Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Oct 22 21:26:35 2013 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Oct 22 21:26:35 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/3418b74b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index acf7a06,1cb580d..5bb11b7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,16 -1,10 +1,19 @@@ +2.1 + * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337) + * change logging from log4j to logback (CASSANDRA-5883) + * switch to LZ4 compression for internode communication (CASSANDRA-5887) + * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971) + * Remove 1.2 network compatibility code (CASSANDRA-5960) + * Remove leveled json manifest migration code (CASSANDRA-5996) + + 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) + 2.0.2 * Update FailureDetector to use nanontime (CASSANDRA-4925) * Fix FileCacheService regressions (CASSANDRA-6149)
