Updated Branches: refs/heads/trunk 564463e40 -> b6ae2e725
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6ae2e72 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6ae2e72 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6ae2e72 Branch: refs/heads/trunk Commit: b6ae2e72539f72904f83d5cb7b62e43258d173a7 Parents: 564463e Author: Jonathan Ellis <[email protected]> Authored: Thu Mar 7 15:21:51 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Mar 7 15:21:51 2013 -0600 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6ae2e72/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 295b994..0af1b35 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -37,6 +37,7 @@ import org.apache.cassandra.config.EncryptionOptions.ServerEncryptionOptions; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DefsTable; import org.apache.cassandra.db.SystemTable; +import org.apache.cassandra.db.Table; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.FSWriteError;
