Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/11bbd9cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/11bbd9cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/11bbd9cb Branch: refs/heads/develop Commit: 11bbd9cb42b1a61f3cf44b46e731d3eff15c1c90 Parents: 68be759 b9b628d Author: Mark Payne <[email protected]> Authored: Sun Jun 7 08:09:00 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Sun Jun 7 08:09:00 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/LICENSE | 37 ++- nifi/nifi-assembly/NOTICE | 120 ++++++++-- .../src/main/resources/META-INF/NOTICE | 27 ++- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../nifi-hadoop-libraries-nar/pom.xml | 96 ++++---- .../src/main/resources/META-INF/LICENSE | 28 +++ .../src/main/resources/META-INF/NOTICE | 81 ++++++- .../src/main/resources/META-INF/LICENSE | 238 ++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/LICENSE | 202 ---------------- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 42 ++++ .../src/main/resources/META-INF/NOTICE | 24 ++ .../nifi-mongodb-processors/pom.xml | 1 - .../src/main/resources/META-INF/LICENSE | 113 +-------- .../src/main/resources/META-INF/NOTICE | 13 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/resources/META-INF/NOTICE | 50 +++- .../src/main/resources/META-INF/LICENSE | 239 +++++++++++++++++++ .../src/main/resources/META-INF/NOTICE | 13 + .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- .../src/main/resources/META-INF/NOTICE | 2 +- nifi/pom.xml | 9 +- 26 files changed, 907 insertions(+), 444 deletions(-) ----------------------------------------------------------------------
