cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 23 Feb 2016 22:40:59 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4bd6d25
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4bd6d25
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4bd6d25

Branch: refs/heads/cassandra-3.0
Commit: c4bd6d2549bd794b81cf0c9a9ac73b97c5a0b686
Parents: e9abaab 77ff794
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Tue Feb 23 14:36:15 2016 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Tue Feb 23 14:37:56 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 src/java/org/apache/cassandra/gms/Gossiper.java |  3 +-
 .../cassandra/gms/FailureDetectorTest.java      | 85 ++++++++++++++++++++
 3 files changed, 87 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4bd6d25/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cd2a930,e989e7f..9ca2f80
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,7 -17,9 +34,8 @@@ Merged from 2.2
   * Fix paging on DISTINCT queries repeats result when first row in partition changes
     (CASSANDRA-10010)
  Merged from 2.1:
+  * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
   * Only notify if repair status changed (CASSANDRA-11172)
 - * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
   * Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
   * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
   * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4bd6d25/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------


Mime
View raw message