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/e585c339 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e585c339 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e585c339 Branch: refs/heads/trunk Commit: e585c339d0fbc07d78bd46aff845d0b721360ad1 Parents: 69542a9 81fe1a2 Author: Benedict Elliott Smith <[email protected]> Authored: Tue Mar 10 17:43:17 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Mar 10 17:43:17 2015 +0000 ---------------------------------------------------------------------- .../src/org/apache/cassandra/stress/util/TimingIntervals.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
