Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3a0d0775 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3a0d0775 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3a0d0775 Branch: refs/heads/master Commit: 3a0d07755e6f02c9e78ab816639cdbc1bc431add Parents: 29e0ffd 394ad08 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Thu Jul 21 18:47:15 2016 -0400 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jul 21 18:47:15 2016 -0400 ---------------------------------------------------------------------- LICENSE | 109 +- NOTICE | 7 - assemble/bin-LICENSE | 989 ------------------- assemble/bin-NOTICE | 18 - assemble/pom.xml | 17 - assemble/src/main/assemblies/component.xml | 22 +- assemble/src/main/resources/LICENSE | 982 ++++++++++++++++++ assemble/src/main/resources/NOTICE | 23 + core/pom.xml | 13 +- .../main/appended-resources/META-INF/LICENSE | 71 +- examples/simple/pom.xml | 12 - pom.xml | 3 +- server/base/pom.xml | 29 - .../src/main/appended-resources/META-INF/NOTICE | 9 - server/base/src/main/javadoc/META-INF/LICENSE | 202 ---- server/base/src/main/javadoc/META-INF/NOTICE | 5 - server/monitor/pom.xml | 3 - .../main/appended-resources/META-INF/LICENSE | 100 +- server/monitor/src/main/javadoc/META-INF/NOTICE | 5 - server/native/src/main/resources/LICENSE | 1 - server/native/src/main/resources/NOTICE | 2 +- server/tserver/pom.xml | 32 - shell/pom.xml | 17 - test/pom.xml | 3 - 24 files changed, 1165 insertions(+), 1509 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/assemble/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/examples/simple/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/server/base/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/server/tserver/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/shell/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3a0d0775/test/pom.xml ----------------------------------------------------------------------
