cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject git commit: fix merge
Date Wed, 24 Oct 2012 19:52:58 GMT
Updated Branches:
  refs/heads/trunk 8cf1259b3 -> 565c57684


fix merge


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

Branch: refs/heads/trunk
Commit: 565c57684bc7423491512b0a71e76680ec2400bf
Parents: 8cf1259
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Oct 24 14:52:55 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Oct 24 14:52:55 2012 -0500

----------------------------------------------------------------------
 .../apache/cassandra/db/RowIteratorFactory.java    |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/565c5768/src/java/org/apache/cassandra/db/RowIteratorFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowIteratorFactory.java b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
index 229a08f..937c496 100644
--- a/src/java/org/apache/cassandra/db/RowIteratorFactory.java
+++ b/src/java/org/apache/cassandra/db/RowIteratorFactory.java
@@ -19,17 +19,9 @@ package org.apache.cassandra.db;
 
 import java.util.*;
 
-<<<<<<< HEAD
-
-import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
-||||||| merged common ancestors
-
-import org.apache.cassandra.db.columniterator.IColumnIterator;
-=======
-import org.apache.cassandra.db.columniterator.IColumnIterator;
 import org.apache.cassandra.db.columniterator.IColumnIteratorFactory;
 import org.apache.cassandra.db.columniterator.LazyColumnIterator;
->>>>>>> cassandra-1.1
+import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
 import org.apache.cassandra.db.filter.QueryFilter;
 import org.apache.cassandra.io.sstable.SSTableReader;
 import org.apache.cassandra.io.sstable.SSTableScanner;


Mime
View raw message