Merge branch 'NIFI-1085'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b75af5b3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b75af5b3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b75af5b3 Branch: refs/heads/master Commit: b75af5b344bc13abd15a6ad413336909a62322cc Parents: 41f3875 6add372 Author: Mike Moser <[email protected]> Authored: Mon Nov 9 16:13:12 2015 -0500 Committer: Mike Moser <[email protected]> Committed: Mon Nov 9 16:13:12 2015 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
