You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/02/29 16:48:00 UTC
[1/3] cassandra git commit: CASSANDRA-11062 follow-up
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 ac06c5bf7 -> a20a0f724
refs/heads/trunk 5ea02a2ce -> 001bdd306
CASSANDRA-11062 follow-up
patch by Caleb Rackliffe; reviewed by Aleksey Yeschenko for CASSANDRA-11062
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a20a0f72
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a20a0f72
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a20a0f72
Branch: refs/heads/cassandra-3.0
Commit: a20a0f724bee67ccf010cfbb72dbc1f90a1d5b4a
Parents: ac06c5b
Author: Caleb Rackliffe <ca...@gmail.com>
Authored: Thu Feb 25 09:31:43 2016 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Feb 29 15:47:00 2016 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a20a0f72/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 164c419..f445e25 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -676,6 +676,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// before mutation stage, so we can get all the hints saved before shutting down
MessagingService.instance().shutdown();
viewMutationStage.shutdown();
+ BatchlogManager.instance.shutdown();
HintsService.instance.pauseDispatch();
counterMutationStage.shutdown();
mutationStage.shutdown();
[2/3] cassandra git commit: CASSANDRA-11062 follow-up
Posted by al...@apache.org.
CASSANDRA-11062 follow-up
patch by Caleb Rackliffe; reviewed by Aleksey Yeschenko for CASSANDRA-11062
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a20a0f72
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a20a0f72
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a20a0f72
Branch: refs/heads/trunk
Commit: a20a0f724bee67ccf010cfbb72dbc1f90a1d5b4a
Parents: ac06c5b
Author: Caleb Rackliffe <ca...@gmail.com>
Authored: Thu Feb 25 09:31:43 2016 -0800
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Feb 29 15:47:00 2016 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a20a0f72/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 164c419..f445e25 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -676,6 +676,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// before mutation stage, so we can get all the hints saved before shutting down
MessagingService.instance().shutdown();
viewMutationStage.shutdown();
+ BatchlogManager.instance.shutdown();
HintsService.instance.pauseDispatch();
counterMutationStage.shutdown();
mutationStage.shutdown();
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/001bdd30
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/001bdd30
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/001bdd30
Branch: refs/heads/trunk
Commit: 001bdd306043f951f27369f9887bda6935026900
Parents: 5ea02a2 a20a0f7
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Feb 29 15:47:42 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Feb 29 15:47:42 2016 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/001bdd30/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------