cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [5/5] git commit: Fix merge
Date Wed, 18 Dec 2013 10:24:06 GMT
Fix merge


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

Branch: refs/heads/trunk
Commit: 1a5ebd6a7d65af8393c9d5c67e7de8088bbb1d0f
Parents: 1273476
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Dec 18 11:23:44 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Dec 18 11:23:44 2013 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/pager/SliceQueryPager.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a5ebd6a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
index 9d8d62c..fbc36e0 100644
--- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
@@ -17,6 +17,7 @@
  */
 package org.apache.cassandra.service.pager;
 
+import java.nio.ByteBuffer;
 import java.util.Collections;
 import java.util.List;
 


Mime
View raw message