You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/06/04 11:19:08 UTC
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/78c03052
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78c03052
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78c03052
Branch: refs/heads/trunk
Commit: 78c03052c572dd9f35d7f7d0e50a634ad5e157b9
Parents: bca8605 16b0288
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Jun 4 11:17:42 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Jun 4 11:17:42 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 7 +-
lib/cassandra-driver-core-2.1.5-shaded.jar | Bin 1994984 -> 0 bytes
...-core-2.2.0-rc1-SNAPSHOT-20150603-shaded.jar | Bin 0 -> 2155169 bytes
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 22 ++----
.../cassandra/hadoop/cql3/CqlRecordReader.java | 69 +++++++++++++++++--
...mitedLocalNodeFirstLocalBalancingPolicy.java | 6 ++
.../cassandra/hadoop/pig/CqlNativeStorage.java | 5 --
.../org/apache/cassandra/cql3/CQLTester.java | 4 +-
test/unit/org/apache/cassandra/cql3/UFTest.java | 22 ++++--
tools/lib/cassandra-driver-core-2.0.9.2.jar | Bin 1847276 -> 0 bytes
11 files changed, 101 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78c03052/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d501b83,933f5a6..688e8ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+3.0:
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+
+
2.2
+ * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
* Clean up gossiper logic for old versions (CASSANDRA-9370)
* Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)
* ant test-all results incomplete when parsed (CASSANDRA-9463)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/78c03052/build.xml
----------------------------------------------------------------------