Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/32b37306 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/32b37306 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/32b37306 Branch: refs/heads/master Commit: 32b373067a82f48c398dd9ba422aa4cf44135cfc Parents: 72d83ac f7b0930 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu May 28 16:56:31 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu May 28 16:56:31 2015 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
