You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2022/07/14 15:16:00 UTC
[cassandra] branch trunk updated (dfd152cfa0 -> 520fb2bb24)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from dfd152cfa0 Merge branch 'cassandra-4.1' into trunk
new 27a31f4cfa Fix flaky BatchUpgradeTest by waiting for clean system.batches
new 520fb2bb24 Merge branch 'cassandra-4.1' into trunk
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:
.../cassandra/distributed/upgrade/BatchUpgradeTest.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 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-4.1' into trunk
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 520fb2bb24cef6891ec9912690b0e94d2ff2016c
Merge: dfd152cfa0 27a31f4cfa
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Thu Jul 14 15:48:08 2022 +0100
Merge branch 'cassandra-4.1' into trunk
.../cassandra/distributed/upgrade/BatchUpgradeTest.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --cc test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
index 3eb72f3add,db5e2e1278..7ba12ff598
--- a/test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/upgrade/BatchUpgradeTest.java
@@@ -31,10 -32,9 +32,9 @@@ public class BatchUpgradeTest extends U
{
new TestCase()
.nodes(2)
-
.nodesToUpgrade(2)
- .upgradesFrom(v40).setup((cluster) -> {
+ .upgradesToCurrentFrom(v40).setup((cluster) -> {
- cluster.schemaChange("CREATE TABLE "+KEYSPACE+".users (" +
+ cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".users (" +
"userid uuid PRIMARY KEY," +
"firstname ascii," +
"lastname ascii," +
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org