accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] accumulo git commit: ACCUMULO-3474 Fix bad merge.
Date Tue, 13 Jan 2015 19:49:00 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6 ae6de85c9 -> c6e771e9d
  refs/heads/master 88499ac3d -> cb288713f


ACCUMULO-3474 Fix bad merge.


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

Branch: refs/heads/1.6
Commit: c6e771e9deda12ac664ba4650c8d798588c046b6
Parents: ae6de85
Author: Josh Elser <elserj@apache.org>
Authored: Tue Jan 13 14:46:49 2015 -0500
Committer: Josh Elser <elserj@apache.org>
Committed: Tue Jan 13 14:46:49 2015 -0500

----------------------------------------------------------------------
 proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c6e771e9/proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
----------------------------------------------------------------------
diff --git a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
index cc9e8c1..9b95acd 100644
--- a/proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
+++ b/proxy/src/test/java/org/apache/accumulo/proxy/SimpleProxyIT.java
@@ -760,8 +760,8 @@ public class SimpleProxyIT {
     upd.setDeleteCell(false);
     Map<ByteBuffer,List<ColumnUpdate>> notDelete = Collections.singletonMap(s2bb("row0"),
Collections.singletonList(upd));
     client.updateAndFlush(creds, TABLE_TEST, notDelete);
-    scanner = client.createScanner(creds, TABLE_TEST, null);
-    entries = client.nextK(scanner, 10);
+    String scanner = client.createScanner(creds, TABLE_TEST, null);
+    ScanResult entries = client.nextK(scanner, 10);
     client.closeScanner(scanner);
     assertFalse(entries.more);
     assertEquals(1, entries.results.size());


Mime
View raw message