Merge branch 'develop' into NIFI-803
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/26008770 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/26008770 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/26008770 Branch: refs/heads/NIFI-744 Commit: 2600877080b4ae8beedf0fc2060577c83627cded Parents: 6a0a321 90ebc3a Author: Mark Payne <[email protected]> Authored: Tue Aug 4 08:54:28 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Aug 4 08:54:28 2015 -0400 ---------------------------------------------------------------------- .../authorization/DownloadAuthorization.java | 2 +- nifi/nifi-bootstrap/pom.xml | 37 +- .../nifi-hl7-query-language/pom.xml | 6 +- nifi/nifi-docs/pom.xml | 19 +- .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 4 - .../nifi-flume-bundle/nifi-flume-nar/pom.xml | 3 +- .../nifi-flume-processors/pom.xml | 32 +- nifi/nifi-nar-bundles/nifi-flume-bundle/pom.xml | 29 +- .../nifi-framework/nifi-site-to-site/pom.xml | 2 +- .../src/main/webapp/WEB-INF/web.xml | 11 +- .../nifi-geo-bundle/nifi-geo-nar/pom.xml | 2 +- .../nifi-hdfs-processors/pom.xml | 4 +- .../nifi-kafka-processors/pom.xml | 1 - .../nifi-twitter-processors/pom.xml | 2 - .../nifi-standard-processors/pom.xml | 553 +++++++++---------- .../nifi-dbcp-service/pom.xml | 28 +- .../nifi-http-context-map/pom.xml | 4 +- .../nifi-standard-services-api-nar/pom.xml | 11 +- 18 files changed, 374 insertions(+), 376 deletions(-) ----------------------------------------------------------------------
