Merge branch '1.6' into 1.7 with -sours
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c6bbae1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c6bbae1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c6bbae1 Branch: refs/heads/1.7 Commit: 1c6bbae1e80dec1b495d4e82fcfb62152a937b1f Parents: 3622556 eefcaa0 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jul 27 13:28:19 2015 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jul 27 13:28:19 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------