Merge branch 'cassandra-2.0' into trunk
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/51b66677
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51b66677
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51b66677
Branch: refs/heads/trunk
Commit: 51b66677ad2ccc453e71546ced67b7d7eeef6c9d
Parents: 0951711 cc01b31
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Wed Oct 23 10:38:07 2013 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Wed Oct 23 10:38:07 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 22 ++++++++++----------
.../apache/cassandra/hadoop/ConfigHelper.java | 4 ++--
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51b66677/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0e97923,b55e0cf..ee45e3e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,3 +1,12 @@@
+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)
- * Fix NPE while loading paxos state (CASSANDRA-6211)
- * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
- 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)
-
-
2.0.2
* Update FailureDetector to use nanontime (CASSANDRA-4925)
* Fix FileCacheService regressions (CASSANDRA-6149)
@@@ -47,6 -27,9 +36,12 @@@
* Add reloadtriggers command to nodetool (CASSANDRA-4949)
* cqlsh: ignore empty 'value alias' in DESCRIBE (CASSANDRA-6139)
* Fix sstable loader (CASSANDRA-6205)
+ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
+ * Fix NPE while loading paxos state (CASSANDRA-6211)
+ * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
++ * Reject bootstrapping if the node already exists in gossip (CASSANDRA-5571)
++ * Fix NPE while loading paxos state (CASSANDRA-6211)
++ * cqlsh: add SHOW SESSION <tracing-session> command (CASSANDRA-6228)
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)
