Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78638cba Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78638cba Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78638cba Branch: refs/heads/1.7 Commit: 78638cba6c24d381cef336cce6251528ba9f951f Parents: a7b482a 9bd3306 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Wed Aug 10 17:49:20 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Wed Aug 10 17:49:20 2016 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
