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/969967cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/969967cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/969967cf Branch: refs/heads/trunk Commit: 969967cf9f5597a32d1a8d2575434f8088add87e Parents: 35af28e 6bff5a3 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Sep 15 16:56:50 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Sep 15 16:56:50 2014 +0100 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressMetrics.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/969967cf/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java ----------------------------------------------------------------------
