Merge branch 'NIFI-718' 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/16925601 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/16925601 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/16925601 Branch: refs/heads/NIFI-632 Commit: 169256015bdef5d2bae6d4676ef776b06cdb42cd Parents: a6de1b4 1faca8c Author: Mark Payne <marka...@hotmail.com> Authored: Tue Jun 23 11:03:47 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Tue Jun 23 11:03:47 2015 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------
