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/fb754062 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fb754062 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fb754062 Branch: refs/heads/master Commit: fb7540629190204634f75a71fc5c92d9be5e792b Parents: aae9e97 8a0518a Author: Josh Elser <els...@apache.org> Authored: Thu Jan 15 17:51:07 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Thu Jan 15 17:51:07 2015 -0500 ---------------------------------------------------------------------- .../test/java/org/apache/accumulo/test/ExistingMacIT.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ----------------------------------------------------------------------
