Merge branch 'master' into NIFI-1267
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9524f637 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9524f637 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9524f637 Branch: refs/heads/master Commit: 9524f637666136a3c69cd852137c2262eee9efda Parents: fee9f38 08d0f3e Author: joewitt <[email protected]> Authored: Mon Dec 7 20:38:44 2015 -0500 Committer: joewitt <[email protected]> Committed: Mon Dec 7 20:38:44 2015 -0500 ---------------------------------------------------------------------- .../nifi-web-ui/src/main/webapp/WEB-INF/web.xml | 1 - .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 46 ++++++++++--------- .../src/main/webapp/js/nf/canvas/nf-settings.js | 48 +++++++++++--------- 3 files changed, 50 insertions(+), 45 deletions(-) ----------------------------------------------------------------------
