merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2383430d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2383430d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2383430d Branch: refs/heads/trunk Commit: 2383430dfd520b9c94f7d20a631f71f209b0d248 Parents: 1bc2fc5 47b2cd6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Aug 27 22:45:25 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Aug 27 22:45:25 2013 -0500 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2383430d/tools/stress/src/org/apache/cassandra/stress/StressAction.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/StressAction.java index ea84647,3668198..7098d0b --- a/tools/stress/src/org/apache/cassandra/stress/StressAction.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressAction.java @@@ -66,7 -64,7 +66,7 @@@ public class StressAction extends Threa int threadCount = client.getThreads(); Consumer[] consumers = new Consumer[threadCount]; - output.println("total,interval_op_rate,interval_key_rate,latency,95th,99th,elapsed_time"); - output.println("total,interval_op_rate,interval_key_rate,latency/95th/99.9th,elapsed_time"); ++ output.println("total,interval_op_rate,interval_key_rate,latency,95th,99.9th,elapsed_time"); int itemsPerThread = client.getKeysPerThread(); int modulo = client.getNumKeys() % threadCount;