Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/cql3/DeleteTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e88c8300
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e88c8300
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e88c8300
Branch: refs/heads/trunk
Commit: e88c83006a9ff479be07f8e1bd377526a4bf8369
Parents: d2a3827 ee401cf
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Fri Jun 20 15:23:46 2014 -0700
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Fri Jun 20 15:23:46 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 +-
.../apache/cassandra/cql3/QueryProcessor.java | 1 +
.../cql3/statements/BatchStatement.java | 75 ++++++----
.../transport/messages/BatchMessage.java | 11 +-
.../org/apache/cassandra/cql3/BatchTests.java | 145 +++++++++++++++++++
.../org/apache/cassandra/cql3/DeleteTest.java | 25 +++-
6 files changed, 215 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f30ef3c,4f68cf7..aea3cf6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,5 +1,18 @@@
+3.0
+ * Move sstable RandomAccessReader to nio2, which allows using the
+ FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
+ * Remove CQL2 (CASSANDRA-5918)
+ * Add Thrift get_multi_slice call (CASSANDRA-6757)
+ * Optimize fetching multiple cells by name (CASSANDRA-6933)
+ * Allow compilation in java 8 (CASSANDRA-7208)
+ * Make incremental repair default (CASSANDRA-7250)
+ * Enable code coverage thru JaCoCo (CASSANDRA-7226)
+ * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369)
+
+
+
2.1.0-rc2
+ * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
* Modify reconcile logic to always pick a tombstone over a counter cell
(CASSANDRA-7346)
* Avoid incremental compaction on Windows (CASSANDRA-7365)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e88c8300/src/java/org/apache/cassandra/transport/messages/BatchMessage.java
----------------------------------------------------------------------
