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/08/13 18:08:37 UTC

[2/2] nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/nifi into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/nifi into develop


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/59624043
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/59624043
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/59624043

Branch: refs/heads/develop
Commit: 5962404379fce200e82651e6dbfcab9dad0532fb
Parents: c169bed b51433e
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Aug 13 12:08:01 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Aug 13 12:08:01 2015 -0400

----------------------------------------------------------------------
 .../nifi-resources/src/main/resources/bin/nifi.sh      |  4 ++--
 .../nifi/processors/standard/EvaluateJsonPath.java     | 13 ++++++++-----
 .../nifi/processors/standard/RouteOnAttribute.java     |  4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------