Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/903f4981 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/903f4981 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/903f4981 Branch: refs/heads/master Commit: 903f4981a2916a815bcf88001def73cd1d784af9 Parents: 14b3349 0f3a620 Author: Mark Payne <[email protected]> Authored: Fri Dec 4 15:14:10 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Dec 4 15:14:10 2015 -0500 ---------------------------------------------------------------------- nifi-docs/src/main/asciidoc/administration-guide.adoc | 4 ++-- .../nifi-resources/src/main/resources/conf/nifi.properties | 4 ++-- .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
