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/1efa053b Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1efa053b Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1efa053b Branch: refs/heads/NIFI-250 Commit: 1efa053b6af6b4d70bed608247b42bd9b92a9127 Parents: eaa8c51 92df0d7 Author: Mark Payne <[email protected]> Authored: Fri Mar 27 12:42:38 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri Mar 27 12:42:38 2015 -0400 ---------------------------------------------------------------------- .../controller/StandardFlowSynchronizer.java | 6 +++--- .../apache/nifi/web/StandardNiFiWebContext.java | 5 ++++- .../nifi/web/api/ControllerServiceResource.java | 10 ++++++--- .../apache/nifi/web/api/ProcessorResource.java | 4 ++++ .../nifi/web/api/ReportingTaskResource.java | 10 ++++++--- .../disable-controller-service-dialog.jsp | 2 +- .../js/nf/canvas/nf-controller-service.js | 17 +++++++++++++++ .../webapp/js/nf/canvas/nf-reporting-task.js | 6 ++++++ .../src/main/webapp/js/nf/canvas/nf-settings.js | 22 ++++++++++++++++++-- 9 files changed, 69 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
