cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [6/8] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 22 Jul 2015 13:05:05 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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/c2142e65
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2142e65
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2142e65

Branch: refs/heads/trunk
Commit: c2142e65496ab81b60a1a4c8bbebf44b6fa438f0
Parents: 172a975 704ca66
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Wed Jul 22 06:01:14 2015 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Wed Jul 22 06:01:14 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java | 65 ++++++++++++++------
 .../cassandra/service/StorageService.java       |  3 +-
 3 files changed, 48 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2142e65/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0d015db,f1e855e..5d142cc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 -2.0.17
 +2.1.9
 + * Fix MarshalException when upgrading superColumn family (CASSANDRA-9582)
 + * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
 + * 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)
 + * Remove repair snapshot leftover on startup (CASSANDRA-7357)
 +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/c2142e65/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2142e65/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message