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/ce248f22 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce248f22 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce248f22 Branch: refs/heads/trunk Commit: ce248f227b0238ed139f7d325689d036ee5bb6f9 Parents: 8262711 e56a64e Author: Brandon Williams <[email protected]> Authored: Fri May 30 17:52:32 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri May 30 17:52:32 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- build.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce248f22/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index be9c2ee,af4da65..3dcc98b --- 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 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556) Merged from 2.0: * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323) Merged from 1.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce248f22/build.xml ----------------------------------------------------------------------
