Merge branch 'master' 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/3e139965 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3e139965 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3e139965 Branch: refs/heads/master Commit: 3e139965122ef60de8aaf916aa4c72c4dd18f460 Parents: b07e13a 53322c9 Author: Mark Payne <[email protected]> Authored: Thu Jan 21 15:02:00 2016 -0500 Committer: Mark Payne <[email protected]> Committed: Thu Jan 21 15:02:00 2016 -0500 ---------------------------------------------------------------------- .../cluster/manager/impl/WebClusterManager.java | 11 ++++++-- .../org/apache/nifi/web/util/SnippetUtils.java | 5 ++++ .../src/main/webapp/js/nf/canvas/nf-actions.js | 20 ++++++++------- .../src/main/webapp/js/nf/canvas/nf-canvas.js | 27 +++++++++++++------- 4 files changed, 43 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3e139965/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3e139965/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3e139965/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js ----------------------------------------------------------------------
