You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/07 21:00:28 UTC
[6/8] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
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/c4874581
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c4874581
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c4874581
Branch: refs/heads/develop
Commit: c48745817ceb1aa7ba450b5cdbca48f54e604ad6
Parents: e631c49 6f2e283
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 7 14:33:21 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Jan 7 14:33:21 2015 -0500
----------------------------------------------------------------------
.../src/main/resources/conf/logback.xml | 13 +-----
.../partials/canvas/processor-configuration.jsp | 4 ++
.../main/webapp/css/processor-configuration.css | 15 +++++++
.../main/webapp/js/jquery/combo/jquery.combo.js | 44 +++++++++++++++-----
.../js/nf/canvas/nf-processor-configuration.js | 24 +++++++----
.../js/nf/canvas/nf-processor-property-table.js | 8 +++-
.../nf/canvas/nf-remote-process-group-ports.js | 5 +++
.../src/main/webapp/js/nf/nf-common.js | 16 +++++++
.../main/webapp/js/nf/nf-processor-details.js | 10 ++++-
.../webapp/js/nf/summary/nf-summary-table.js | 31 +++++++++++---
10 files changed, 131 insertions(+), 39 deletions(-)
----------------------------------------------------------------------