Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6a8a43f6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6a8a43f6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6a8a43f6 Branch: refs/heads/master Commit: 6a8a43f66bbc77cad5d385a98b78869b5bf8aeb5 Parents: 71fde9e e6d1ee2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Aug 10 17:49:38 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Aug 10 17:49:38 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
