[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

[busbey]

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
        
core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java


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

Branch: refs/heads/master
Commit: a8572fe57690831b29b724c67f162857e9297577
Parents: 5d030ca 7ec60f1
Author: Sean Busbey <bus...@cloudera.com>
Authored: Thu Mar 27 11:51:45 2014 -0500
Committer: Sean Busbey <bus...@cloudera.com>
Committed: Thu Mar 27 11:51:45 2014 -0500

----------------------------------------------------------------------
 .../accumulo/core/client/mock/MockTableOperations.java  | 12 ++++++++----
 .../core/client/mock/MockTableOperationsTest.java       |  6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8572fe5/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8572fe5/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
----------------------------------------------------------------------
diff --cc 
core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
index 216b3ba,e377884..94dbed1
--- 
a/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/mock/MockTableOperationsTest.java
@@@ -266,10 -266,14 +266,14 @@@ public class MockTableOperationsTest 
      }
      bw.flush();
      to.deleteRows("test", new Text("1"), new Text("2"));
 -    Scanner s = connector.createScanner("test", Constants.NO_AUTHS);
 +    Scanner s = connector.createScanner("test", Authorizations.EMPTY);
+     int oneCnt = 0;
      for (Entry<Key,Value> entry : s) {
-       Assert.assertTrue(entry.getKey().getRow().toString().charAt(0) != '1');
+       char rowStart = entry.getKey().getRow().toString().charAt(0);
+       Assert.assertTrue(rowStart != '2');
+       oneCnt += rowStart == '1' ? 1 : 0;
      }
+     Assert.assertEquals(5, oneCnt);
    }
 -  
 +
  }