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/5876d934 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5876d934 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5876d934 Branch: refs/heads/trunk Commit: 5876d93424ff49bba9db2de19442992c4dfe641d Parents: b5795ef 597a1d5 Author: Benedict Elliott Smith <[email protected]> Authored: Fri Dec 12 15:07:34 2014 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Dec 12 15:07:34 2014 +0000 ---------------------------------------------------------------------- .../apache/cassandra/stress/WorkManager.java | 65 ++ .../stress/generate/PartitionIterator.java | 632 +++++++++++++++++++ .../SampledOpDistributionFactory.java | 1 + 3 files changed, 698 insertions(+) ----------------------------------------------------------------------
