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/6697ed5b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6697ed5b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6697ed5b Branch: refs/heads/master Commit: 6697ed5bd4dc3815d60ec236859b6f8a3e22daec Parents: a3af982 3d63bf7 Author: Josh Elser <els...@apache.org> Authored: Wed Jun 24 14:02:14 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Jun 24 14:02:14 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
