You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/20 06:13:30 UTC
[1/3] git commit: remove unused field 'severity'
Repository: cassandra
Updated Branches:
refs/heads/trunk f987e361e -> 96171d36b
remove unused field 'severity'
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76139e42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76139e42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76139e42
Branch: refs/heads/trunk
Commit: 76139e42693959c5975f46803b9897f009656846
Parents: 4f4b5dd
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 20 00:09:26 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 20 00:09:26 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/76139e42/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 567bb19..45bceb5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -104,8 +104,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
/* JMX notification serial number counter */
private final AtomicLong notificationSerialNumber = new AtomicLong();
- private final AtomicDouble severity = new AtomicDouble();
-
private static int getRingDelay()
{
String newdelay = System.getProperty("cassandra.ring_delay_ms");
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96171d36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96171d36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96171d36
Branch: refs/heads/trunk
Commit: 96171d36bffa4fc55835295d2332b948614c3d71
Parents: f987e36 8465a91
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 20 00:12:50 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 20 00:12:50 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
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/8465a91b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8465a91b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8465a91b
Branch: refs/heads/trunk
Commit: 8465a91b4d0909f2b48b45845c4b78bf1cd8c849
Parents: ba08eb3 76139e4
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 20 00:10:14 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 20 00:10:14 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------