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/2e336b83 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e336b83 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e336b83 Branch: refs/heads/master Commit: 2e336b8326f8c297acd635890b4579350a7a3659 Parents: 5bf2dab 4258886 Author: Josh Elser <[email protected]> Authored: Tue Apr 28 20:09:36 2015 -0400 Committer: Josh Elser <[email protected]> Committed: Tue Apr 28 20:09:36 2015 -0400 ---------------------------------------------------------------------- server/native/pom.xml | 1 + server/native/src/main/resources/Makefile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e336b83/server/native/pom.xml ----------------------------------------------------------------------
