Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/39bca481 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39bca481 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39bca481 Branch: refs/heads/trunk Commit: 39bca48134e6ccc9f60ae0b0846bd9c47b672080 Parents: c824165 05a0658 Author: Stefan Podkowinski <[email protected]> Authored: Mon Apr 3 20:02:11 2017 +0200 Committer: Stefan Podkowinski <[email protected]> Committed: Mon Apr 3 20:02:30 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/CassandraDaemon.java | 6 +-- .../metrics/CassandraMetricsRegistryTest.java | 47 +++++++++++++++++--- 3 files changed, 45 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bca481/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bca481/src/java/org/apache/cassandra/service/CassandraDaemon.java ----------------------------------------------------------------------
