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/f71ef609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f71ef609 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f71ef609 Branch: refs/heads/trunk Commit: f71ef609930a9f10691e8febd4bf7c984efe5114 Parents: f8b1a9e 3d5b5c3 Author: Brandon Williams <[email protected]> Authored: Fri Feb 7 08:54:29 2014 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Feb 7 08:54:29 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/CassandraDaemon.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f71ef609/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 0ad47ac,d87f6d8..179e955 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -20,8 -20,10 +20,9 @@@ package org.apache.cassandra.service import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; + import java.lang.management.MemoryPoolMXBean; import java.net.InetAddress; -import java.net.MalformedURLException; -import java.net.URL; +import java.net.UnknownHostException; import java.util.Arrays; import java.util.Map; import java.util.UUID;
