Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/fac6cd7a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fac6cd7a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fac6cd7a Branch: refs/heads/NIFI-250 Commit: fac6cd7ac6dc1ed883a18369ebfbbde0886b11ec Parents: a3836d8 57b5d58 Author: Matt Gilman <[email protected]> Authored: Thu Feb 19 07:50:29 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Thu Feb 19 07:50:29 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(-) ----------------------------------------------------------------------
