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/01/30 19:01:05 UTC

[2/7] incubator-nifi git commit: Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250

Merge branch 'NIFI-250' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250


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

Branch: refs/heads/NIFI-250
Commit: fbc14e0a3a46c0511d6135e86797cfc14c81d7d5
Parents: 9a6acab 1ebaf1d
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jan 29 16:26:08 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jan 29 16:26:08 2015 -0500

----------------------------------------------------------------------
 .../css/controller-service-configuration.css    | 32 ++++++++
 .../src/main/webapp/css/settings.css            |  2 +-
 .../nf-controller-service-configuration.js      | 79 ++++++++++++++++----
 3 files changed, 96 insertions(+), 17 deletions(-)
----------------------------------------------------------------------