Merge branch 'develop', remote branch 'origin/develop' 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/c55e8510 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c55e8510 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c55e8510 Branch: refs/heads/develop Commit: c55e8510891c0e2eeb25a0b32fd574ae71aa8a7c Parents: 4410b70 3861446 Author: joewitt <joew...@apache.org> Authored: Tue Dec 9 20:59:30 2014 -0500 Committer: joewitt <joew...@apache.org> Committed: Tue Dec 9 20:59:30 2014 -0500 ---------------------------------------------------------------------- .../web/controller/StandardSearchContext.java | 18 +--- .../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 ++-- 7 files changed, 103 insertions(+), 99 deletions(-) ----------------------------------------------------------------------
