cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Date Fri, 05 Aug 2016 15:56:00 GMT
Merge branch 'cassandra-3.9' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/143d1696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/143d1696
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/143d1696

Branch: refs/heads/trunk
Commit: 143d16961a67cc9d5608605ee2561253de629d2c
Parents: 4b905bb aab33f1
Author: T Jake Luciani <jake@apache.org>
Authored: Fri Aug 5 11:54:28 2016 -0400
Committer: T Jake Luciani <jake@apache.org>
Committed: Fri Aug 5 11:54:28 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |  19 ++
 build.xml                                       |   2 +
 doc/source/operating/metrics.rst                |  87 ++++++++
 lib/licenses/metrics-jvm-3.1.0.txt              | 202 +++++++++++++++++++
 lib/metrics-jvm-3.1.0.jar                       | Bin 0 -> 35907 bytes
 .../cassandra/service/CassandraDaemon.java      |  16 +-
 6 files changed, 325 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/143d1696/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/143d1696/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/143d1696/doc/source/operating/metrics.rst
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/143d1696/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index e9b0df3,cd98af0..eaf35ac
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -526,10 -536,10 +540,10 @@@ public class CassandraDaemo
          if (nativeTransportService != null)
              nativeTransportService.destroy();
          StorageService.instance.setRpcReady(false);
-         
+ 
          // On windows, we need to stop the entire system as prunsrv doesn't have the jsvc
hooks
          // We rely on the shutdown hook to drain the node
 -        if (FBUtilities.isWindows())
 +        if (FBUtilities.isWindows)
              System.exit(0);
  
          if (jmxServer != null)


Mime
View raw message