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/7633d920 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7633d920 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7633d920 Branch: refs/heads/trunk Commit: 7633d9205889a0894bc0587522197741bbf7adbf Parents: 24e1bc7 f5a1c37 Author: Jake Luciani <j...@apache.org> Authored: Fri Aug 1 09:25:21 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Fri Aug 1 09:25:21 2014 -0400 ---------------------------------------------------------------------- tools/cqlstress-counter-example.yaml | 7 +--- tools/cqlstress-example.yaml | 8 +---- tools/cqlstress-insanity-example.yaml | 18 +++-------- .../apache/cassandra/stress/StressProfile.java | 34 +++++++++++--------- .../org/apache/cassandra/stress/StressYaml.java | 1 - 5 files changed, 25 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7633d920/tools/stress/src/org/apache/cassandra/stress/StressProfile.java ----------------------------------------------------------------------
