Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb05059 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb05059 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb05059 Branch: refs/heads/trunk Commit: cfb05059271db9ca2e52dba4ea41cc03051345d0 Parents: 094f5f9 68b3f6e Author: Sylvain Lebresne <[email protected]> Authored: Thu Jul 28 16:34:36 2016 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Jul 28 16:34:36 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../ReplicationAwareTokenAllocatorTest.java | 15 ++++++ test/unit/org/apache/cassandra/Util.java | 56 ++++++++++++++++++++ 3 files changed, 72 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb05059/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb05059/test/unit/org/apache/cassandra/Util.java ----------------------------------------------------------------------
