You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/01/20 04:32:54 UTC
[2/2] git commit: Merge branch 'cassandra-1.2' of
http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Merge branch 'cassandra-1.2' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
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/3575fdcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3575fdcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3575fdcc
Branch: refs/heads/cassandra-1.2
Commit: 3575fdccb7b9dee720c06d133aa5895bf0bb0787
Parents: d387240 9be437b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Sun Jan 19 19:28:24 2014 -0800
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Sun Jan 19 19:28:24 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 3 +
conf/cassandra-env.sh | 15 ++--
.../apache/cassandra/db/BatchlogManager.java | 78 +++++++++++++++----
.../apache/cassandra/net/MessagingService.java | 15 +---
.../cassandra/service/StorageService.java | 21 ++++-
.../cassandra/thrift/CustomTHsHaServer.java | 7 +-
.../cassandra/db/BatchlogManagerTest.java | 82 ++++++++++++++++++++
7 files changed, 178 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3575fdcc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8626b64,0b49665..639e17c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,7 -10,9 +10,10 @@@
* Add ability to throttle batchlog replay (CASSANDRA-6550)
* Fix executing LOCAL_QUORUM with SimpleStrategy (CASSANDRA-6545)
* Avoid StackOverflow when using large IN queries (CASSANDRA-6567)
+ * Nodetool upgradesstables includes secondary indexes (CASSANDRA-6589)
+ * Paginate batchlog replay (CASSANDRA-6569)
+ * skip blocking on streaming during drain (CASSANDRA-6603)
+ * Improve error message when schema doesn't match loaded sstable (CASSANDRA-6262)
1.2.13