Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/849c43b1 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/849c43b1 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/849c43b1 Branch: refs/heads/master Commit: 849c43b162583d23473fd899f38c568260b02c7c Parents: 83d5cb3 7facf95 Author: Pierre Villard <[email protected]> Authored: Wed Jun 15 18:55:18 2016 +0200 Committer: Pierre Villard <[email protected]> Committed: Wed Jun 15 18:55:18 2016 +0200 ---------------------------------------------------------------------- .../nifi/cluster/protocol/StandardDataFlow.java | 19 ------------------- .../protocol/jaxb/message/AdaptedDataFlow.java | 14 -------------- .../protocol/jaxb/message/DataFlowAdapter.java | 2 -- .../apache/nifi/cluster/protocol/DataFlow.java | 5 ----- .../nifi/controller/StandardFlowService.java | 2 +- 5 files changed, 1 insertion(+), 41 deletions(-) ----------------------------------------------------------------------
