SYSTEM_KS -> SYSTEM_TABLE for 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/712d4686 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/712d4686 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/712d4686 Branch: refs/heads/trunk Commit: 712d46868ac7e3d3b9f79df38e15005467a8540c Parents: 3a6125d Author: Jonathan Ellis <[email protected]> Authored: Thu Mar 7 15:26:10 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Thu Mar 7 15:26:10 2013 -0600 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/712d4686/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 b9b9feb..afcfb42 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -36,6 +36,7 @@ import org.apache.cassandra.config.Config.RequestSchedulerId; 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.io.util.FileUtils; import org.apache.cassandra.locator.DynamicEndpointSnitch; @@ -550,7 +551,7 @@ public class DatabaseDescriptor { public boolean accept(File pathname) { - return (pathname.isDirectory() && !Table.SYSTEM_KS.equals(pathname.getName())); + return (pathname.isDirectory() && !Table.SYSTEM_TABLE.equals(pathname.getName())); } }).length;
