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/712327fe Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/712327fe Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/712327fe Branch: refs/heads/NIFI-250 Commit: 712327fe8eac0c96a4d676a1ffe2210801d97200 Parents: abd1dc3 1cee436 Author: Mark Payne <[email protected]> Authored: Tue Mar 31 08:41:56 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Tue Mar 31 08:41:56 2015 -0400 ---------------------------------------------------------------------- .../nifi/web/api/dto/PropertyDescriptorDTO.java | 8 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 19 ++-- .../canvas/controller-service-configuration.jsp | 2 +- .../disable-controller-service-dialog.jsp | 5 +- .../canvas/enable-controller-service-dialog.jsp | 5 +- .../src/main/webapp/css/controller-service.css | 8 +- .../js/nf/canvas/nf-controller-service.js | 102 +++++++++++++++---- .../src/main/webapp/js/nf/canvas/nf-settings.js | 32 ++++-- 8 files changed, 136 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
