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/d4410263 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4410263 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4410263 Branch: refs/heads/trunk Commit: d4410263db587b4250fb1a9b4bc73d14c52f4fc0 Parents: 4e21f72 042e1f7 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Aug 4 08:51:14 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Aug 4 08:51:14 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/metrics/TableMetrics.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4410263/CHANGES.txt ----------------------------------------------------------------------