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/58985409 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58985409 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58985409 Branch: refs/heads/trunk Commit: 58985409c9e7883bd1362687413771dcbc90ccf7 Parents: 14b1c96 a6678a2 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Sun Sep 14 13:51:08 2014 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Sun Sep 14 13:51:08 2014 +0100 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/util/Timing.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
