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:26 UTC

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

Branch: refs/heads/NIFI-250
Commit: 95b22a0aee87f29a5ebcfacd6a5fb274ca95b837
Parents: 21e809a b6b1859
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Jan 13 13:35:39 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Jan 13 13:35:39 2015 -0500

----------------------------------------------------------------------
 .../nifi-web-ui/src/main/webapp/css/summary.css |  2 ++
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   | 21 ++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------