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/71fde9e6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/71fde9e6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/71fde9e6 Branch: refs/heads/master Commit: 71fde9e639da6042592efd21d143f7fb8749c861 Parents: f5c9f7f f1c3f38 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Aug 10 16:10:03 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Aug 10 16:10:03 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
