You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2020/04/21 14:15:05 UTC
[cassandra] branch cassandra-3.11 updated (9b940a5 -> d833df8)
This is an automated email from the ASF dual-hosted git repository.
snazy pushed a change to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 9b940a5 Merge branch 'cassandra-3.0' into cassandra-3.11
new 2aa7cf8 FBUtilitities.testWaitFirstFuture is flaky
new d833df8 Merge branch 'cassandra-3.0' into cassandra-3.11
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/cassandra/utils/FBUtilitiesTest.java | 54 +++++++++++++---------
1 file changed, 33 insertions(+), 21 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Posted by sn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
snazy pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d833df80a9b1225f80cb1cc8847411509a9dc77a
Merge: 9b940a5 2aa7cf8
Author: Robert Stupp <sn...@snazy.de>
AuthorDate: Tue Apr 21 16:12:47 2020 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
.../apache/cassandra/utils/FBUtilitiesTest.java | 54 +++++++++++++---------
1 file changed, 33 insertions(+), 21 deletions(-)
diff --cc test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java
index 0300b9d,f13d076..ecdb03e
--- a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java
+++ b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java
@@@ -23,11 -23,11 +23,12 @@@ import java.net.InetAddress
import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.TreeMap;
+import java.util.ArrayList;
+import java.util.List;
+ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org