You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/04/22 14:34:44 UTC
[08/19] git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdfe4e03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdfe4e03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdfe4e03
Branch: refs/heads/cassandra-2.1
Commit: cdfe4e0338bcb0f7f8d04af4b328a1e86c481ce2
Parents: 75b87ce 7dbbe92
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Apr 17 23:14:25 2014 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Apr 17 23:14:25 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 9 +-
NEWS.txt | 11 +-
build.xml | 4 +-
debian/changelog | 6 +
.../apache/cassandra/db/BatchlogManager.java | 2 +-
.../cassandra/net/OutboundTcpConnection.java | 12 +-
.../cassandra/service/MigrationManager.java | 12 +-
.../cassandra/service/StorageService.java | 138 +++++++++++--------
.../cassandra/streaming/ConnectionHandler.java | 2 +-
.../cassandra/streaming/StreamSession.java | 6 +-
.../cassandra/streaming/StreamTransferTask.java | 4 +-
11 files changed, 136 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdfe4e03/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b642908,451d046..01830ef
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,7 @@@
2.0.7
+ * Put nodes in hibernate when join_ring is false (CASSANDRA-6961)
- * Allow compaction of system tables during startup (CASSANDRA-6913)
+ * Avoid early loading of non-system keyspaces before compaction-leftovers
+ cleanup at startup (CASSANDRA-6913)
* Restrict Windows to parallel repairs (CASSANDRA-6907)
* (Hadoop) Allow manually specifying start/end tokens in CFIF (CASSANDRA-6436)
* Fix NPE in MeteredFlusher (CASSANDRA-6820)