Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe8fbc8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe8fbc8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe8fbc8f Branch: refs/heads/trunk Commit: fe8fbc8f1d2a91d21ef5643577e375334bd20f62 Parents: 9cd4f82 bf47408 Author: Benedict Elliott Smith <[email protected]> Authored: Thu Aug 6 14:51:39 2015 +0200 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Aug 6 14:51:39 2015 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/Util.java | 24 ++++++++++---------- .../cassandra/concurrent/WaitQueueTest.java | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
