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/a2b15bfa Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2b15bfa Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2b15bfa Branch: refs/heads/1.7 Commit: a2b15bfa9937f7a2c9106323d4216c562f6d6e02 Parents: c85e04f d36e317 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Feb 10 13:02:23 2016 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Feb 10 13:02:23 2016 -0500 ---------------------------------------------------------------------- test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/a2b15bfa/test/src/test/java/org/apache/accumulo/test/ExistingMacIT.java ----------------------------------------------------------------------
