This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 0cd3b689597604982e6bb0c822ad300549638d17
Merge: c81d7dc a8ef9c9
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Wed Mar 11 17:34:20 2020 +0100
Merge branch 'cassandra-2.2' into cassandra-3.0
src/java/org/apache/cassandra/utils/GuidGenerator.java | 6 ++----
.../cql3/validation/operations/ThriftCQLTester.java | 10 +++-------
test/unit/org/apache/cassandra/gms/ArrivalWindowTest.java | 14 +++-----------
.../unit/org/apache/cassandra/security/SSLFactoryTest.java | 4 ++--
test/unit/org/apache/cassandra/triggers/TriggersTest.java | 13 ++++++-------
5 files changed, 16 insertions(+), 31 deletions(-)
diff --cc
test/unit/org/apache/cassandra/cql3/validation/operations/ThriftCQLTester.java
index a77e861,7947317..5d4d1a0
---
a/test/unit/org/apache/cassandra/cql3/validation/operations/ThriftCQLTester.java
+++
b/test/unit/org/apache/cassandra/cql3/validation/operations/ThriftCQLTester.java
@@@ -77,10 -74,10 +73,10 @@@ public class ThriftCQLTester extends CQ
public Cassandra.Client getClient() throws Throwable
{
- return getClient(InetAddress.getLocalHost().getHostName(),
thriftPort);
+ return getClient(FBUtilities.getLocalAddress().getHostName(),
thriftPort);
}
- public Cassandra.Client getClient(String hostname, int thriftPort)
throws Throwable
+ public Cassandra.Client getClient(String hostname, int thriftPort) throws
Throwable
{
if (client == null)
client = new Cassandra.Client(new TBinaryProtocol(new
TFramedTransportFactory().openTransport(hostname, thriftPort)));
diff --cc test/unit/org/apache/cassandra/triggers/TriggersTest.java
index 67619dc,3cd0a2c..70e040b
--- a/test/unit/org/apache/cassandra/triggers/TriggersTest.java
+++ b/test/unit/org/apache/cassandra/triggers/TriggersTest.java
@@@ -66,10 -61,9 +65,10 @@@ public class TriggersTes
@Before
public void setup() throws Exception
{
+ StorageService.instance.initServer(0);
if (thriftServer == null || ! thriftServer.isRunning())
{
- thriftServer = new ThriftServer(InetAddress.getLocalHost(), 9170,
50);
+ thriftServer = new ThriftServer(FBUtilities.getLocalAddress(),
9170, 50);
thriftServer.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
