Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eabdc83f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eabdc83f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eabdc83f Branch: refs/heads/master Commit: eabdc83f97553ba43224b34c0f096855009381d6 Parents: fe6da34 74859ee Author: Eric C. Newton <[email protected]> Authored: Tue Jun 23 15:33:46 2015 -0400 Committer: Eric C. Newton <[email protected]> Committed: Tue Jun 23 15:33:46 2015 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/mrit/IntegrationTestMapReduce.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
