Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/17add531 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/17add531 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/17add531 Branch: refs/heads/NIFI-250 Commit: 17add531f656b6d8065bed74a887acaa00a07f9a Parents: 3425dee 4a49ba7 Author: Matt Gilman <[email protected]> Authored: Thu Feb 5 07:13:56 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Thu Feb 5 07:13:56 2015 -0500 ---------------------------------------------------------------------- nifi/LICENSE | 328 +++----- nifi/NOTICE | 8 - nifi/README.md | 26 +- nifi/nifi-assembly/LICENSE | 780 +++++++++++++++++++ nifi/nifi-assembly/NOTICE | 529 +++++++++++++ nifi/nifi-assembly/README.md | 124 +++ nifi/nifi-assembly/pom.xml | 6 +- .../src/main/assembly/dependencies.xml | 6 +- .../src/main/resources/META-INF/LICENSE | 264 +++++++ .../src/main/resources/META-INF/NOTICE | 131 ++++ .../nifi-web/nifi-web-api/pom.xml | 2 +- .../src/main/resources/META-INF/NOTICE | 27 + .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/LICENSE | 434 +++++++++++ .../src/main/resources/META-INF/NOTICE | 35 + .../src/main/resources/META-INF/LICENSE | 359 +++++++++ .../src/main/resources/META-INF/NOTICE | 237 ++++++ .../src/main/resources/META-INF/NOTICE | 37 + .../src/main/resources/META-INF/LICENSE | 299 +++++++ .../src/main/resources/META-INF/NOTICE | 72 ++ .../src/main/resources/META-INF/NOTICE | 202 +++++ .../src/main/resources/META-INF/LICENSE | 292 +++++++ .../src/main/resources/META-INF/NOTICE | 119 +++ .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/NOTICE | 19 + .../src/main/resources/META-INF/LICENSE | 238 ++++++ .../src/main/resources/META-INF/NOTICE | 49 ++ nifi/pom.xml | 3 +- 29 files changed, 4419 insertions(+), 264 deletions(-) ----------------------------------------------------------------------
