cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [1/3] git commit: more merge breakage
Date Thu, 17 Oct 2013 18:38:49 GMT
Updated Branches:
  refs/heads/cassandra-2.0 aefa20d0f -> 886f16ca1
  refs/heads/trunk eb711fd1d -> c63d2249d


more merge breakage


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/886f16ca
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/886f16ca
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/886f16ca

Branch: refs/heads/cassandra-2.0
Commit: 886f16ca1c14f1209151579408b59cd699832cbf
Parents: aefa20d
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Oct 17 13:37:04 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Oct 17 13:37:04 2013 -0500

----------------------------------------------------------------------
 .../org/apache/cassandra/config/DatabaseDescriptor.java     | 9 ---------
 1 file changed, 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/886f16ca/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 0d6e1fb..14c5a23 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -279,15 +279,6 @@ public class DatabaseDescriptor
             }
         }
 
-        try
-        {
-            listenAddress = InetAddress.getByName(conf.listen_address);
-        }
-        catch (UnknownHostException e)
-        {
-            throw new ConfigurationException("Unknown listen_address '" + conf.listen_address
+ "'");
-        }
-
         /* Gossip Address to broadcast */
         if (conf.broadcast_address != null)
         {


Mime
View raw message