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/0feecbf3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0feecbf3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0feecbf3 Branch: refs/heads/master Commit: 0feecbf3617935513d36c6f3684cfd6eb3d4b85e Parents: 98e3df2 73cbdc0 Author: John Vines <[email protected]> Authored: Mon Dec 16 13:35:40 2013 -0500 Committer: John Vines <[email protected]> Committed: Mon Dec 16 13:35:40 2013 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/admin/TableOperationsImpl.java | 2 +- .../org/apache/accumulo/minicluster/MiniAccumuloClusterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
