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/ad676c1e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ad676c1e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ad676c1e Branch: refs/heads/master Commit: ad676c1e9de1062320ffe056c82557e6473c1e04 Parents: 80f8439 f228caf Author: John Vines <vi...@apache.org> Authored: Wed Dec 18 15:49:38 2013 -0500 Committer: John Vines <vi...@apache.org> Committed: Wed Dec 18 15:49:38 2013 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/server/util/Admin.java | 4 ++++ test/src/test/java/org/apache/accumulo/test/NamespacesIT.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
