Merge branch 'NIFI-250' of https://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/23465a1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/23465a1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/23465a1e Branch: refs/heads/NIFI-250 Commit: 23465a1e116ee10c2c73a9ed25d7b382096f9b52 Parents: d4321f5 1abee29 Author: Matt Gilman <[email protected]> Authored: Tue Mar 31 11:09:32 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Mar 31 11:09:32 2015 -0400 ---------------------------------------------------------------------- .../cluster/manager/impl/WebClusterManager.java | 10 +++++-- .../controller/StandardFlowSynchronizer.java | 19 ++++++++++++- .../controller/tasks/ReportingTaskWrapper.java | 29 ++++++++++---------- 3 files changed, 41 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
