You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/01/14 19:35:32 UTC

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

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/67dee2e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67dee2e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67dee2e3

Branch: refs/heads/NIFI-250
Commit: 67dee2e33b19589ea6756b031ecf68540008bd33
Parents: eaca6a2 80793cc
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 14 07:07:20 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jan 14 07:07:20 2015 -0500

----------------------------------------------------------------------
 .../src/main/webapp/js/nf/canvas/nf-actions.js  |  2 +-
 .../js/nf/canvas/nf-processor-configuration.js  | 23 +++++++++++++++++++-
 .../src/main/webapp/js/nf/nf-shell.js           | 10 +++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)
----------------------------------------------------------------------