You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/01 22:23:09 UTC
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' 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/c2579b92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2579b92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2579b92
Branch: refs/heads/trunk
Commit: c2579b92bf2e721c099720a27b5d9e56be66e49c
Parents: f74063c 5bd6a75
Author: Brandon Williams <br...@apache.org>
Authored: Thu May 1 15:19:15 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu May 1 15:19:15 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 +
.../cassandra/locator/GoogleCloudSnitch.java | 128 +++++++++++++++++++
.../locator/GoogleCloudSnitchTest.java | 108 ++++++++++++++++
3 files changed, 239 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2579b92/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d98174b,16fcdfc..0c32f3c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,14 @@@
+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)
+
+ 2.1.0-rc1
+ Merged from 2.0:
+ * Add Google Compute Engine snitch (CASSANDRA-7132)
2.1.0-beta2
* Increase default CL space to 8GB (CASSANDRA-7031)