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/77625187 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77625187 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77625187 Branch: refs/heads/trunk Commit: 77625187458beaadd8f964f8efba72292c012244 Parents: cfb7ace eecc034 Author: Benedict Elliott Smith <[email protected]> Authored: Sat Sep 20 08:44:43 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Sat Sep 20 08:44:43 2014 +0100 ---------------------------------------------------------------------- .../apache/cassandra/stress/StressAction.java | 34 +++++++++++--------- .../cassandra/stress/settings/SettingsRate.java | 24 +++++++------- 2 files changed, 31 insertions(+), 27 deletions(-) ----------------------------------------------------------------------
