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/e6d1ee25 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6d1ee25 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6d1ee25 Branch: refs/heads/master Commit: e6d1ee2549cd340a2d924bf5617b7083698b6edf Parents: f1c3f38 78638cb Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Aug 10 17:49:28 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Aug 10 17:49:28 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
