Merge branch 'develop' into NIFI-353
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8f54adf1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8f54adf1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8f54adf1 Branch: refs/heads/NIFI-353 Commit: 8f54adf1c1e6cc581ee501d6f1182dac2ff63512 Parents: 605a05b 57b5d58 Author: Matt Gilman <[email protected]> Authored: Sat Feb 21 08:02:47 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Sat Feb 21 08:02:47 2015 -0500 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-actions.js | 26 ++++++++++++++------ .../main/webapp/js/nf/canvas/nf-canvas-utils.js | 4 +++ 2 files changed, 22 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
