cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject git commit: 'Merge made by recursive' indeed.
Date Mon, 25 Jun 2012 17:50:01 GMT
Updated Branches:
  refs/heads/trunk 708ab005a -> 27a816e5f


'Merge made by recursive' indeed.


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27a816e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27a816e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27a816e5

Branch: refs/heads/trunk
Commit: 27a816e5ff5e605e9154bd5a32ece7e112dbc30e
Parents: 708ab00
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Mon Jun 25 12:49:50 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Mon Jun 25 12:49:50 2012 -0500

----------------------------------------------------------------------
 .../apache/cassandra/io/sstable/SSTableLoader.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/27a816e5/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 2183a73..7ce26f4 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
@@ -303,12 +303,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;


Mime
View raw message