Merge branch 'develop' of https://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/ecb3680a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ecb3680a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ecb3680a Branch: refs/heads/develop Commit: ecb3680a77cfda2fd7589703253a61a63b977790 Parents: c309509 11bbd9c Author: danbress <[email protected]> Authored: Sun Jun 7 08:10:56 2015 -0400 Committer: danbress <[email protected]> Committed: Sun Jun 7 08:10:56 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/LICENSE | 37 ++- nifi/nifi-assembly/NOTICE | 120 ++++++++-- .../src/main/resources/META-INF/NOTICE | 27 ++- .../org/apache/nifi/groups/ProcessGroup.java | 11 + .../nifi/groups/StandardProcessGroup.java | 88 +++++-- .../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 +++- .../processors/standard/CompressContent.java | 79 +++--- .../standard/TestCompressContent.java | 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 +- 30 files changed, 1072 insertions(+), 507 deletions(-) ----------------------------------------------------------------------
