Updated Branches: refs/heads/1.6.0-SNAPSHOT 0b95612fa -> b59c2687a
Merge branch '1.4.5-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.4.5-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5a421c7a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5a421c7a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5a421c7a Branch: refs/heads/1.6.0-SNAPSHOT Commit: 5a421c7a06cfa2bf41df33bd77369f03849aaee9 Parents: 53a7d51 2235b50 Author: Josh Elser <els...@apache.org> Authored: Thu Dec 19 15:50:21 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Dec 19 15:50:21 2013 -0500 ---------------------------------------------------------------------- .../accumulo/server/master/state/MetaDataTableScanner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------