[cassandra] branch trunk updated: ninja: fix bad merge to 4.0 of CASSANDRA-14931

[be...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

benedict pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/trunk by this push:
     new e871903  ninja: fix bad merge to 4.0 of CASSANDRA-14931
e871903 is described below

commit e871903d41d9f19c966a52bf643ec2efab6f63f1
Author: Benedict Elliott Smith <be...@apache.org>
AuthorDate: Tue Jan 22 10:04:17 2019 +0000

    ninja: fix bad merge to 4.0 of CASSANDRA-14931
---
 .../cassandra/distributed/LegacyAdapter.java       | 42 ----------------------
 1 file changed, 42 deletions(-)

diff --git a/test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java b/test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java
deleted file mode 100644
index 1ff88ed..0000000
--- a/test/distributed/org/apache/cassandra/distributed/LegacyAdapter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.distributed;
-
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.utils.FBUtilities;
-
-import java.net.InetAddress;
-
-public class LegacyAdapter
-{
-    private static final InetAddressAndPort broadcastAddressAndPort;
-    static
-    {
-        InetAddress address = FBUtilities.getBroadcastAddress();
-        int port = DatabaseDescriptor.getStoragePort();
-        broadcastAddressAndPort = InetAddressAndPort.getByAddressOverrideDefaults(address, port);
-    }
-
-    public static InetAddressAndPort getBroadcastAddressAndPort()
-    {
-        return broadcastAddressAndPort;
-    }
-
-}


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org