cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [4/6] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Mon, 30 Mar 2015 22:02:36 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/5abab57b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5abab57b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5abab57b

Branch: refs/heads/trunk
Commit: 5abab57b93817dfac939eb13eac812091d3655c6
Parents: 6ee4b09 0ff9c3c
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Mar 30 17:02:11 2015 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Mar 30 17:02:11 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5abab57b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd5e277,539c4c8..00b632d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -87,6 -24,10 +87,7 @@@ Merged from 2.0
   * Fix CQLSSTableWriter throwing exception and spawning threads
     (CASSANDRA-8808)
   * Fix MT mismatch between empty and GC-able data (CASSANDRA-8979)
+  * Fix incorrect validation when snapshotting single table (CASSANDRA-8056)
 -
 -
 -2.0.13:
   * Add offline tool to relevel sstables (CASSANDRA-8301)
   * Preserve stream ID for more protocol errors (CASSANDRA-8848)
   * Fix combining token() function with multi-column relations on

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


Mime
View raw message