Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into ACCUMULO-1854-1.5-merge
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f098247 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f098247 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f098247 Branch: refs/heads/master Commit: 4f0982473451815264da8c8d919424787fbf3122 Parents: 03b065d 7eaedc4 Author: Josh Elser <els...@apache.org> Authored: Fri Nov 22 13:00:47 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Nov 22 13:00:47 2013 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/server/util/MetadataTable.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------