Merge branch '1.6' into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3d63bf7e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d63bf7e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d63bf7e Branch: refs/heads/master Commit: 3d63bf7eb168296c9705a9815792985ae7ee5114 Parents: d0c1e9f 18d68fc Author: Josh Elser <els...@apache.org> Authored: Wed Jun 24 13:58:53 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Jun 24 13:58:53 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
