Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c85c32a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c85c32a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8c85c32a Branch: refs/heads/master Commit: 8c85c32af5a0db509c9859ad8bc008cdb2d72892 Parents: 7dca4ab 4136bfa Author: Christopher Tubbs <ctubb...@apache.org> Authored: Sat Sep 10 18:54:54 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Sat Sep 10 18:54:54 2016 -0400 ---------------------------------------------------------------------- docs/src/main/resources/design/ACCUMULO-378-design.mdtext | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------