Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dc69bc80 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dc69bc80 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dc69bc80 Branch: refs/heads/master Commit: dc69bc80ae0413d16e5ee3681f9a9a3660c5f819 Parents: 18591bc 10ce7af Author: Christopher Tubbs <ctubb...@apache.org> Authored: Fri May 16 12:58:47 2014 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Fri May 16 12:58:47 2014 -0400 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
