You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nifi.apache.org by ma...@apache.org on 2015/07/03 19:51:01 UTC

[2/2] incubator-nifi git commit: Merge branch 'NIFI-717' into develop

Merge branch 'NIFI-717' 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/f3b55d46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f3b55d46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f3b55d46

Branch: refs/heads/develop
Commit: f3b55d46d6a374ee27b2decb3ee7284fd294a10d
Parents: 63a9008 a2b9d70
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jul 3 13:50:43 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Jul 3 13:50:43 2015 -0400

----------------------------------------------------------------------
 .../nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------