cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 29 Apr 2014 00:01:46 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: 7316bb3a65ca0e7e543bf16fe2c69f7d88dc7b31
Parents: 9a0f258 2b32293
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Mon Apr 28 19:59:53 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Mon Apr 28 19:59:53 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                            | 2 +-
 src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7316bb3a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1b67357,50d5896..de564e9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -126,12 -88,8 +126,12 @@@ Merged from 1.2
   * Schedule schema pulls on change (CASSANDRA-6971)
   * Non-droppable verbs shouldn't be dropped from OTC (CASSANDRA-6980)
   * Shutdown batchlog executor in SS#drain() (CASSANDRA-7025)
 + * Fix batchlog to account for CF truncation records (CASSANDRA-6999)
 + * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018)
   * Properly load trustore in the native protocol (CASSANDRA-6847)
 -
 + * Always clean up references in SerializingCache (CASSANDRA-6994)
 + * Don't shut MessagingService down when replacing a node (CASSANDRA-6476)
- 
++ * fix npe when doing -Dcassandra.fd_initial_value_ms (CASSANDRA-6751)
  
  2.0.6
   * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7316bb3a/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------


Mime
View raw message