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/25314c20 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25314c20 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25314c20 Branch: refs/heads/trunk Commit: 25314c2046ec2495e4dee48174af70a73d1ec08a Parents: a109441 9c0f575 Author: T Jake Luciani <[email protected]> Authored: Mon Dec 1 16:06:53 2014 -0500 Committer: T Jake Luciani <[email protected]> Committed: Mon Dec 1 16:06:53 2014 -0500 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/util/Timing.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
