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/ca05baa7 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ca05baa7 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ca05baa7 Branch: refs/heads/master Commit: ca05baa70befe6ebc9aaedaa93f1f83dafcb33d4 Parents: fb5fc55 6558b4a Author: Josh Elser <els...@apache.org> Authored: Sat Sep 12 18:33:17 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sat Sep 12 18:33:17 2015 -0400 ---------------------------------------------------------------------- LICENSE | 134 +--- NOTICE | 11 +- assemble/bin-LICENSE | 674 +++++++++++++++++++ assemble/bin-NOTICE | 59 ++ assemble/src/main/assemblies/component.xml | 14 +- .../main/appended-resources/META-INF/LICENSE | 46 ++ .../main/appended-resources/META-INF/LICENSE | 74 ++ .../src/main/appended-resources/META-INF/NOTICE | 9 + 8 files changed, 910 insertions(+), 111 deletions(-) ----------------------------------------------------------------------
