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/60e5e0ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60e5e0ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60e5e0ef Branch: refs/heads/trunk Commit: 60e5e0ef4c6c9dbbb6c81fce07fec26433b57a69 Parents: 5514110 3c531cb Author: Josh McKenzie <[email protected]> Authored: Tue Jun 14 11:13:42 2016 -0400 Committer: Josh McKenzie <[email protected]> Committed: Tue Jun 14 11:13:42 2016 -0400 ---------------------------------------------------------------------- conf/metrics-reporter-config-sample.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
