Updated Branches: refs/heads/cassandra-1.1 ae76bda56 -> 112ce0c69
removed duplicate SSTableLoader.setPartitioner(IPartitioner) method introduced by patch for CASSANDRA-4368 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/112ce0c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/112ce0c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/112ce0c6 Branch: refs/heads/cassandra-1.1 Commit: 112ce0c69b940d6b663c1e44d2c765bbfc526e8f Parents: de55757 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Jun 26 00:33:10 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Jun 26 00:33:10 2012 +0300 ---------------------------------------------------------------------- .../apache/cassandra/io/sstable/SSTableLoader.java | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/112ce0c6/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java index 2ffe671..850d23b 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java @@ -304,12 +304,6 @@ public class SSTableLoader DatabaseDescriptor.setPartitioner(partitioner); } - protected void setPartitioner(IPartitioner partitioner) throws ConfigurationException - { - this.partitioner = partitioner; - DatabaseDescriptor.setPartitioner(partitioner); - } - public IPartitioner getPartitioner() { return partitioner;
