You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2016/01/15 16:14:27 UTC
cassandra git commit: fix merge issue
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.3 597729d9d -> dba2e16c9
fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dba2e16c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dba2e16c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dba2e16c
Branch: refs/heads/cassandra-3.3
Commit: dba2e16c95951216d401358180b309eec34eb7e5
Parents: 597729d
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jan 15 10:14:07 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jan 15 10:14:07 2016 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dba2e16c/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 7466556..0ce25cb 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -98,9 +98,11 @@ import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.CounterMutationVerbHandler;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.DefinitionsUpdateVerbHandler;
+import org.apache.cassandra.db.Directories;
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.MigrationRequestVerbHandler;
import org.apache.cassandra.db.MutationVerbHandler;
+import org.apache.cassandra.db.PartitionPosition;
import org.apache.cassandra.db.RangeSliceVerbHandler;
import org.apache.cassandra.db.ReadCommandVerbHandler;
import org.apache.cassandra.db.ReadRepairVerbHandler;