Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/416776aa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/416776aa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/416776aa Branch: refs/heads/master Commit: 416776aa280b646f74084edd7911af6baad8a823 Parents: 59875c2 255ce5f Author: Josh Elser <els...@apache.org> Authored: Thu Sep 18 12:24:48 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Sep 18 12:24:48 2014 -0400 ---------------------------------------------------------------------- .../accumulo/test/functional/AccumuloInputFormatIT.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ----------------------------------------------------------------------