Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6cc5ab56 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6cc5ab56 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6cc5ab56 Branch: refs/heads/1.7 Commit: 6cc5ab56bec23edb916dbc2a9b32cbef4ff8a4e1 Parents: 5596b01 a95127d Author: Eric C. Newton <eric.new...@gmail.com> Authored: Mon Feb 1 14:29:36 2016 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Mon Feb 1 14:29:36 2016 -0500 ---------------------------------------------------------------------- .../org/apache/accumulo/test/functional/GarbageCollectorIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6cc5ab56/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java ----------------------------------------------------------------------
