You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/10/17 20:38:49 UTC
[1/3] git commit: more merge breakage
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 <br...@apache.org>
Authored: Thu Oct 17 13:37:04 2013 -0500
Committer: Brandon Williams <br...@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)
{
[2/3] git commit: more merge breakage
Posted by br...@apache.org.
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/trunk
Commit: 886f16ca1c14f1209151579408b59cd699832cbf
Parents: aefa20d
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 17 13:37:04 2013 -0500
Committer: Brandon Williams <br...@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)
{
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c63d2249
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c63d2249
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c63d2249
Branch: refs/heads/trunk
Commit: c63d2249ded1fcbae5e42ac8202219325f50d81b
Parents: eb711fd 886f16c
Author: Brandon Williams <br...@apache.org>
Authored: Thu Oct 17 13:37:12 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Oct 17 13:37:12 2013 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c63d2249/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------