You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/02/17 18:13:05 UTC
[8/9] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
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/c9a4bffe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9a4bffe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9a4bffe
Branch: refs/heads/trunk
Commit: c9a4bffee6b76fe340695403886ae18027972bf9
Parents: 73dcdbd 4b50b2b
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Feb 17 11:12:38 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Feb 17 11:12:38 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/repair/RepairJob.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a4bffe/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d9d0f20,bdfec11..d7bc77e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -62,8 -25,8 +62,9 @@@ Merged from 1.2
* Use real node messaging versions for schema exchange decisions (CASSANDRA-6700)
* IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701)
* Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
+ * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
+
2.0.5
* Reduce garbage generated by bloom filter lookups (CASSANDRA-6609)
* Add ks.cf names to tombstone logging (CASSANDRA-6597)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9a4bffe/src/java/org/apache/cassandra/repair/RepairJob.java
----------------------------------------------------------------------