Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7b7975ca Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7b7975ca Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7b7975ca Branch: refs/heads/master Commit: 7b7975ca126e9df5ab5daf8869729b1d35981e9b Parents: 55a6d3e b9a190a Author: Josh Elser <els...@apache.org> Authored: Tue Jul 7 22:39:59 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Jul 7 22:39:59 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/core/client/BatchScanner.java | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------