Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/service/CassandraDaemon.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/040e67ef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/040e67ef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/040e67ef
Branch: refs/heads/trunk
Commit: 040e67efd088dccc340d6382dfee72ad96400ffd
Parents: 7a14367 88944ff
Author: Yuki Morishita <[email protected]>
Authored: Wed Oct 2 10:11:18 2013 -0500
Committer: Yuki Morishita <[email protected]>
Committed: Wed Oct 2 10:11:18 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/cql3handling.py | 2 +-
.../org/apache/cassandra/config/DatabaseDescriptor.java | 9 ++-------
src/java/org/apache/cassandra/config/Schema.java | 2 +-
.../org/apache/cassandra/service/CassandraDaemon.java | 8 ++++----
src/java/org/apache/cassandra/service/ClientState.java | 10 +++++++---
.../org/apache/cassandra/service/StorageService.java | 11 +++++++++--
7 files changed, 25 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/040e67ef/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/040e67ef/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/040e67ef/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 83bfe3a,1de5b49..536f319
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -21,10 -21,10 +21,8 @@@ import java.io.File
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
- import java.util.concurrent.atomic.AtomicInteger;
-
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.StandardMBean;
@@@ -33,16 -33,20 +31,18 @@@ import com.addthis.metrics.reporter.con
import com.google.common.collect.Iterables;
import com.google.common.collect.SetMultimap;
-
-import org.apache.log4j.PropertyConfigurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
- import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.MeteredFlusher;
+ import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.db.commitlog.CommitLog;
import org.apache.cassandra.db.compaction.CompactionManager;
-import org.apache.cassandra.db.compaction.LegacyLeveledManifest;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.FSError;
import org.apache.cassandra.io.util.FileUtils;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/040e67ef/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
