Merge branch 'NIFI-259' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-259
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/c65829f0 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/c65829f0 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/c65829f0 Branch: refs/heads/master Commit: c65829f0cbf5e2b48165efe8284862f43255496e Parents: 0cd6f80 3f4bd91 Author: Mark Payne <[email protected]> Authored: Wed Jan 13 15:12:44 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Wed Jan 13 15:12:44 2016 -0500 ---------------------------------------------------------------------- .../cluster/manager/impl/WebClusterManager.java | 65 +++++++++++++++++++- .../apache/nifi/web/api/ProcessorResource.java | 9 +++ .../webapp/js/nf/canvas/nf-component-state.js | 10 +-- 3 files changed, 76 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
