You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/07/22 15:05:07 UTC
[8/8] 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/7659ae2e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7659ae2e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7659ae2e
Branch: refs/heads/trunk
Commit: 7659ae2eefd2fc20776b11e1961b3d57f0f1e9c6
Parents: daa3fe6 11ac938
Author: Jason Brown <ja...@gmail.com>
Authored: Wed Jul 22 06:04:46 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Wed Jul 22 06:04:46 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 56 ++++++++++++++------
.../cassandra/service/StorageService.java | 3 +-
3 files changed, 42 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7659ae2e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 793140b,0fb392a..56c3495
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -36,8 -13,9 +36,9 @@@ Merged from 2.1
* Handle corrupt files on startup (CASSANDRA-9686)
* Fix clientutil jar and tests (CASSANDRA-9760)
* (cqlsh) Allow the SSL protocol version to be specified through the
- config file or environment variables (CASSANDRA-9544)
+ config file or environment variables (CASSANDRA-9544)
Merged from 2.0:
+ * checkForEndpointCollision fails for legitimate collisions (CASSANDRA-9765)
* Complete CASSANDRA-8448 fix (CASSANDRA-9519)
* Don't include auth credentials in debug log (CASSANDRA-9682)
* Can't transition from write survey to normal mode (CASSANDRA-9740)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7659ae2e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------