Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1c3f38d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1c3f38d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1c3f38d Branch: refs/heads/1.8 Commit: f1c3f38d82d6601c9d326417b1bffa9102068749 Parents: 3fded56 a7b482a Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Aug 10 16:09:38 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Aug 10 16:09:38 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
