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/24b4f1cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/24b4f1cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/24b4f1cf Branch: refs/heads/NIFI-250 Commit: 24b4f1cf1109af53d6fd94d81fe81141e7dd0423 Parents: 4de0fd0 cb84829 Author: Mark Payne <[email protected]> Authored: Tue Jan 27 08:36:57 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Tue Jan 27 08:36:57 2015 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/ControllerServiceDTO.java | 10 +++++----- .../org/apache/nifi/controller/FlowFromDOMFactory.java | 2 +- .../apache/nifi/controller/StandardFlowSynchronizer.java | 2 +- .../org/apache/nifi/fingerprint/FingerprintFactory.java | 2 +- .../apache/nifi/web/api/ControllerServiceResource.java | 1 + .../main/java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 ++ 6 files changed, 11 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
