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

Posted to commits@nifi.apache.org by jo...@apache.org on 2015/04/20 05:13:09 UTC

[32/50] [abbrv] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

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

Branch: refs/heads/NIFI-271
Commit: f1c36e64f1e4e5f2f24eb91291dd51cfe8893a85
Parents: 1963c27 df57555
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Apr 10 14:55:23 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Apr 10 14:55:23 2015 -0400

----------------------------------------------------------------------
 .../src/main/webapp/WEB-INF/jsp/hexview.jsp     |  2 +-
 .../src/main/webapp/css/main.css                |  2 +-
 .../propertytable/jquery.propertytable.js       | 74 +++++++++++++-------
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js |  7 +-
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   |  8 ++-
 .../src/main/webapp/js/application.js           | 13 ++--
 6 files changed, 68 insertions(+), 38 deletions(-)
----------------------------------------------------------------------