Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/51085be3 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51085be3 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51085be3 Branch: refs/heads/master Commit: 51085be3fbac9dbb1e1d9dfb21cee7e4efdbe20e Parents: 554231e 7838d40 Author: Josh Elser <els...@apache.org> Authored: Fri Dec 27 12:00:44 2013 -0500 Committer: Josh Elser <els...@apache.org> Committed: Fri Dec 27 12:00:44 2013 -0500 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
