Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/700cc0cc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/700cc0cc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/700cc0cc Branch: refs/heads/master Commit: 700cc0ccdb3e7e1d2b3f1c43168fd2136cd6b7ab Parents: 15a459b 7ff6169 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Jan 21 18:02:25 2015 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Jan 21 18:02:25 2015 -0500 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
