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/91e002eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/91e002eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/91e002eb Branch: refs/heads/NIFI-250 Commit: 91e002eb90795a1c2d2711c3e20db520fce155ff Parents: 47435c8 5db358f Author: Mark Payne <[email protected]> Authored: Wed Mar 25 15:46:19 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Mar 25 15:46:19 2015 -0400 ---------------------------------------------------------------------- .../nifi/web/api/ReportingTaskResource.java | 5 +- .../org/apache/nifi/web/api/dto/DtoFactory.java | 41 ++++++- .../web/dao/impl/StandardReportingTaskDAO.java | 4 + .../src/main/webapp/css/controller-service.css | 1 + .../js/nf/canvas/nf-controller-service.js | 121 ++++++++++++------- .../webapp/js/nf/canvas/nf-reporting-task.js | 36 +++--- 6 files changed, 149 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
