Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2849cbd8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2849cbd8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2849cbd8 Branch: refs/heads/master Commit: 2849cbd8e25f87691788c6cee8bbea0ffa2155fb Parents: 8485134 a8572fe Author: Sean Busbey <bus...@cloudera.com> Authored: Thu Mar 27 11:58:19 2014 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Thu Mar 27 11:58:19 2014 -0500 ---------------------------------------------------------------------- .../accumulo/core/client/mock/MockTableOperations.java | 12 ++++++++---- .../core/client/mock/MockTableOperationsTest.java | 6 +++++- 2 files changed, 13 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
