Merge branch 'develop' into nifi-site-to-site-client
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/4c04fe65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4c04fe65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4c04fe65 Branch: refs/heads/develop Commit: 4c04fe65285ca90d86e937eae3438f4dddb6c86f Parents: 081471c 0133f84 Author: Mark Payne <marka...@hotmail.com> Authored: Mon Feb 9 20:42:37 2015 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Mon Feb 9 20:42:37 2015 -0500 ---------------------------------------------------------------------- nifi-site/Gruntfile.js | 5 +- nifi-site/src/includes/topbar.hbs | 6 +- nifi-site/src/js/app.js | 2 + nifi-site/src/pages/html/developer-guide.hbs | 7 + nifi-site/src/pages/html/download.hbs | 2 +- nifi-site/src/pages/html/overview.hbs | 7 + nifi-site/src/pages/html/screencasts.hbs | 15 + nifi-site/src/pages/html/user-guide.hbs | 7 + nifi-site/src/scss/app.scss | 22 + nifi/LICENSE | 343 +++----- nifi/NOTICE | 8 - nifi/README.md | 26 +- nifi/nifi-assembly/LICENSE | 803 +++++++++++++++++++ nifi/nifi-assembly/NOTICE | 529 ++++++++++++ nifi/nifi-assembly/README.md | 124 +++ nifi/nifi-assembly/pom.xml | 6 +- .../src/main/assembly/dependencies.xml | 6 +- nifi/nifi-docs/LICENSE | 235 ++++++ nifi/nifi-docs/NOTICE | 5 + nifi/nifi-docs/pom.xml | 30 +- .../src/main/asciidoc/asciidoc-mod.css | 418 ++++++++++ .../src/main/asciidoc/developer-guide.adoc | 32 +- .../src/main/assembly/dependencies.xml | 16 + .../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 ++++++++++ .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 2 +- .../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 | 5 +- 45 files changed, 5241 insertions(+), 293 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/4c04fe65/nifi/pom.xml ----------------------------------------------------------------------