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/18e834ec Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18e834ec Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18e834ec Branch: refs/heads/master Commit: 18e834ec251fefa308a695f1bc2414c473e2e166 Parents: 47cf834 38f36e2 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Oct 1 12:47:31 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Oct 1 12:47:31 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------