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:17:07 UTC
[1/2] cassandra git commit: fix merge issue
Repository: cassandra
Updated Branches:
refs/heads/trunk 0c82f977a -> 6148f5214
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/trunk
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;
[2/2] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6148f521
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6148f521
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6148f521
Branch: refs/heads/trunk
Commit: 6148f5214455993d08a37ef1028f785120d31f9c
Parents: 0c82f97 dba2e16
Author: T Jake Luciani <ja...@apache.org>
Authored: Fri Jan 15 10:14:55 2016 -0500
Committer: T Jake Luciani <ja...@apache.org>
Committed: Fri Jan 15 10:14:55 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/6148f521/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------