Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be94a904 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be94a904 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be94a904 Branch: refs/heads/trunk Commit: be94a90415ea6ef7c55295c79dcbdc145fce4b06 Parents: cd0cbd3 6d1f05e Author: Aleksey Yeschenko <[email protected]> Authored: Tue Jun 10 00:42:52 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Jun 10 00:42:52 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryProcessor.java | 3 +-- .../org/apache/cassandra/cql3/statements/BatchStatement.java | 7 +------ .../org/apache/cassandra/transport/messages/BatchMessage.java | 4 +++- 4 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be94a904/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 11a9db9,b70782b..cded133 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,5 +1,15 @@@ +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) + + 2.1.0 + * Fix native protocol CAS batches (CASSANDRA-7337) * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359) * Upgrade to Pig 0.12.1 (CASSANDRA-6556) * Make sure we clear out repair sessions from netstats (CASSANDRA-7329) http://git-wip-us.apache.org/repos/asf/cassandra/blob/be94a904/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be94a904/src/java/org/apache/cassandra/transport/messages/BatchMessage.java ----------------------------------------------------------------------
