Commit a872e912 authored by Ewen Cheslack-Postava's avatar Ewen Cheslack-Postava
Browse files

Merge remote-tracking branch 'origin/3.2.x' into 3.3.x

parents 8a87a071 8fc51204
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public class BulkProcessorTest {

    assertFalse(client.expectationsMet());

    final int flushTimeoutMs = 10;
    final int flushTimeoutMs = 100;
    bulkProcessor.flush(flushTimeoutMs);
  }