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/33a094de Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33a094de Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33a094de Branch: refs/heads/master Commit: 33a094de4aab9bb26c896a6744e168628316597a Parents: 4fbba38 ea8fe54 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jan 6 21:26:23 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jan 6 21:26:23 2014 -0500 ---------------------------------------------------------------------- .../accumulo/server/tables/TableManager.java | 5 ++- .../java/org/apache/accumulo/master/Master.java | 41 ++++++++++++-------- 2 files changed, 28 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
