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/f5a1c374 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5a1c374 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5a1c374 Branch: refs/heads/trunk Commit: f5a1c374c48898fa934792da680f80ccecf92f30 Parents: b407ebc d667556 Author: Jake Luciani <j...@apache.org> Authored: Fri Aug 1 09:24:42 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Fri Aug 1 09:24:42 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(-) ----------------------------------------------------------------------
