You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by if...@apache.org on 2020/01/29 18:18:33 UTC
[cassandra] branch trunk updated (ec4174d -> 609bac6)
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from ec4174d Merge branch 'cassandra-3.11' into trunk
new f7ee96c Fix missing call to enable RPC after native transport is started in in-jvm dtests
new f1d07ac Merge branch 'cassandra-2.2' into cassandra-3.0
new 02e551a Merge branch 'cassandra-3.0' into cassandra-3.11
new 609bac6 Merge branch 'cassandra-3.11' into trunk
The 4 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/distributed/impl/Instance.java | 5 ++++-
.../distributed/test/NativeProtocolTest.java | 19 +++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
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.11' into trunk
Posted by if...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 609bac6bbd424d0fe5fe149ab367eaf54110c185
Merge: ec4174d 02e551a
Author: Alex Petrov <ol...@gmail.com>
AuthorDate: Wed Jan 29 19:15:53 2020 +0100
Merge branch 'cassandra-3.11' into trunk
.../apache/cassandra/distributed/impl/Instance.java | 5 ++++-
.../distributed/test/NativeProtocolTest.java | 19 +++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --cc test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 03cc9b9,986c864..6ec1a9e
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@@ -386,14 -440,14 +386,15 @@@ public class Instance extends IsolatedE
if (config.has(NATIVE_PROTOCOL))
{
+ // Start up virtual table support
+ CassandraDaemon.getInstanceForTesting().setupVirtualKeyspaces();
+
CassandraDaemon.getInstanceForTesting().initializeNativeTransport();
CassandraDaemon.getInstanceForTesting().startNativeTransport();
+ StorageService.instance.setRpcReady(true);
}
- if (!FBUtilities.getBroadcastAddress().equals(broadcastAddressAndPort().address))
- throw new IllegalStateException();
- if (DatabaseDescriptor.getStoragePort() != broadcastAddressAndPort().port)
+ if (!FBUtilities.getBroadcastAddressAndPort().equals(broadcastAddressAndPort()))
throw new IllegalStateException();
}
catch (Throwable t)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org