Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bdbdc1e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bdbdc1e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bdbdc1e Branch: refs/heads/cassandra-2.1 Commit: 4bdbdc1e397902ff35623878c7264324bf675afd Parents: c1c3375 852f084 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Sep 8 22:21:13 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Sep 8 22:21:13 2014 -0400 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressMetrics.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
