Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/336a665a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/336a665a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/336a665a Branch: refs/heads/cassandra-2.1 Commit: 336a665a14d8305a195cdf13a7c86f227a59317e Parents: 3d25859 89da2c9 Author: Jonathan Ellis <[email protected]> Authored: Fri Feb 28 14:45:13 2014 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Feb 28 14:45:13 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/336a665a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java index cbf3094,210ae17..8d064dd --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@@ -437,10 -401,10 +437,10 @@@ public class ColumnFamilyStore implemen String columnFamily, IPartitioner partitioner, CFMetaData metadata, - boolean loadSSTables) throws ConfigurationException + boolean loadSSTables) { // get the max generation number, to prevent generation conflicts - Directories directories = Directories.create(keyspace.getName(), columnFamily); + Directories directories = new Directories(metadata); Directories.SSTableLister lister = directories.sstableLister().includeBackups(true); List<Integer> generations = new ArrayList<Integer>(); for (Map.Entry<Descriptor, Set<Component>> entry : lister.list().entrySet())
