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/da47fb21 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da47fb21 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da47fb21 Branch: refs/heads/1.8 Commit: da47fb2107acf42e0398cfb5bf1c2cbb5aa586d7 Parents: f289ae2 62c31b5 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jan 9 17:28:06 2017 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jan 9 17:28:06 2017 -0500 ---------------------------------------------------------------------- NOTICE | 2 +- assemble/src/main/resources/NOTICE | 2 +- docs/src/main/asciidoc/accumulo_user_manual.asciidoc | 2 +- server/native/src/main/resources/NOTICE | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/da47fb21/assemble/src/main/resources/NOTICE ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/da47fb21/docs/src/main/asciidoc/accumulo_user_manual.asciidoc ----------------------------------------------------------------------
