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/0c94837d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c94837d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c94837d Branch: refs/heads/master Commit: 0c94837d600daf13d2f8d14bdebfa1cccb902e01 Parents: 0c4ae15 1ecbc3c Author: Eric C. Newton <eric.new...@gmail.com> Authored: Tue Sep 29 14:49:02 2015 -0400 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Tue Sep 29 14:49:02 2015 -0400 ---------------------------------------------------------------------- LICENSE | 3 - assemble/bin-LICENSE | 334 ++++++++++++++++++- .../java/org/apache/accumulo/fate/ZooStore.java | 26 +- server/base/pom.xml | 29 ++ server/base/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++ server/base/src/main/javadoc/META-INF/NOTICE | 5 + server/monitor/pom.xml | 29 ++ .../monitor/src/main/javadoc/META-INF/LICENSE | 202 +++++++++++ server/monitor/src/main/javadoc/META-INF/NOTICE | 5 + server/tserver/pom.xml | 29 ++ shell/.gitignore | 1 + 11 files changed, 853 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c94837d/server/base/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c94837d/server/monitor/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c94837d/server/tserver/pom.xml ----------------------------------------------------------------------
