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/4d7c1ccd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4d7c1ccd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4d7c1ccd Branch: refs/heads/master Commit: 4d7c1ccda7801451319dc0c8e7b5f1274082145e Parents: 8beeaa6 e5dfd06 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Nov 13 13:05:00 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Nov 13 13:05:00 2013 -0500 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
