Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/5ebf3b51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5ebf3b51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5ebf3b51 Branch: refs/heads/nifi-27 Commit: 5ebf3b51cd7a51ed52ac38c37797b5268129d633 Parents: cb63c66 2735c6c Author: Mark Payne <marka...@hotmail.com> Authored: Wed Dec 10 11:08:10 2014 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed Dec 10 11:08:10 2014 -0500 ---------------------------------------------------------------------- .../resources/src/main/resources/bin/nifi.sh | 16 +++- .../web/controller/StandardSearchContext.java | 18 +--- .../accesscontrol/DfmAccessControlTest.java | 26 +++++- .../src/main/webapp/js/nf/canvas/nf-canvas.js | 95 ++++++++++---------- .../main/webapp/js/nf/canvas/nf-connectable.js | 8 +- .../main/webapp/js/nf/canvas/nf-draggable.js | 49 ++++++---- .../js/nf/canvas/nf-processor-property-table.js | 10 +-- .../main/webapp/js/nf/canvas/nf-selectable.js | 6 +- .../main/webapp/js/nf/nf-processor-details.js | 16 ++-- 9 files changed, 142 insertions(+), 102 deletions(-) ----------------------------------------------------------------------