Merge remote-tracking branch 'origin/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/f115f197 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f115f197 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f115f197 Branch: refs/heads/master Commit: f115f19794eacfb3623dbe78216e4e9dcf57e988 Parents: 92e2f8e 3751c67 Author: John Vines <vi...@apache.org> Authored: Wed Jan 29 19:06:27 2014 -0500 Committer: John Vines <vi...@apache.org> Committed: Wed Jan 29 19:06:27 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/server/util/MetadataTableUtil.java | 11 +++++++++-- .../org/apache/accumulo/master/FateServiceHandler.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
