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/d3d10958 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d3d10958 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d3d10958 Branch: refs/heads/develop Commit: d3d10958a77e423f1c3844bbeb28c2b01afaf24c Parents: e07b910 3004ff1 Author: Mark Payne <marka...@hotmail.com> Authored: Wed Dec 31 16:17:51 2014 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed Dec 31 16:17:51 2014 -0500 ---------------------------------------------------------------------- assembly/pom.xml | 1 + .../org/apache/nifi/util/NiFiProperties.java | 6 + .../src/main/resources/conf/nifi.properties | 1 + .../org/apache/nifi/web/server/JettyServer.java | 2 +- .../nifi/processors/standard/GetFile.java | 20 +- .../index.html | 6 +- nifi-docs/src/main/asciidoc/overview.adoc | 188 +++++++++++++------ 7 files changed, 162 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
