Merge branch 'cassandra-3.X' into trunk

2016-12-12 16:45:35 -08:00 · 2016-12-12 16:45:35 -08:00 · e8b8a90336
parent 2d21cbda22 58a29302cf
commit e8b8a90336
1 changed files with 1 additions and 1 deletions
--- a/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java
+++ b/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java
@ -64,7 +64,7 @@ public class HintsBufferPoolTest
        });
        blocked.start();

-        Util.spinAssertEquals(State.WAITING, () -> blocked.getState(), 1);
+        Util.spinAssertEquals(true, () -> blockedOnBackpressure, 60);

        while (blocked.isAlive())
            if (!returnedBuffers.isEmpty())