You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2014/12/16 20:05:47 UTC
[19/19] incubator-nifi git commit: Merge branch 'develop' into
NIFI-169
Merge branch 'develop' into NIFI-169
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/a94cf4be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/a94cf4be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/a94cf4be
Branch: refs/heads/develop
Commit: a94cf4be4b339bf520517d2d00390f8bc3b249e1
Parents: d9dab00 d7b1113
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 16 12:53:40 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 16 12:53:40 2014 -0500
----------------------------------------------------------------------
.../webapp/WEB-INF/pages/bulletin-board.jsp | 8 +-
.../src/main/webapp/WEB-INF/pages/canvas.jsp | 14 +-
.../src/main/webapp/WEB-INF/pages/cluster.jsp | 10 +-
.../src/main/webapp/WEB-INF/pages/counters.jsp | 10 +-
.../src/main/webapp/WEB-INF/pages/history.jsp | 10 +-
.../main/webapp/WEB-INF/pages/provenance.jsp | 10 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp | 10 +-
.../src/main/webapp/WEB-INF/pages/templates.jsp | 12 +-
.../src/main/webapp/WEB-INF/pages/users.jsp | 10 +-
.../WEB-INF/partials/canvas/canvas-header.jsp | 1 +
.../canvas/secure-port-configuration.jsp | 3 +-
.../summary/view-single-node-dialog.jsp | 1 +
.../nifi-web-ui/src/main/webapp/css/header.css | 29 +-
.../src/main/webapp/css/port-configuration.css | 16 +-
.../main/webapp/css/processor-configuration.css | 6 +
.../nifi-web-ui/src/main/webapp/css/summary.css | 11 +-
.../src/main/webapp/js/codemirror/LICENSE | 38 +-
.../js/codemirror/addon/edit/matchbrackets.js | 125 -
.../js/codemirror/addon/hint/show-hint.css | 54 +-
.../js/codemirror/addon/hint/show-hint.js | 411 -
.../js/codemirror/lib/codemirror-compressed.js | 16 +
.../webapp/js/codemirror/lib/codemirror.css | 282 +-
.../main/webapp/js/codemirror/lib/codemirror.js | 8488 -----------------
.../nifi-web-ui/src/main/webapp/js/d3/LICENSE | 52 +-
.../nifi-web-ui/src/main/webapp/js/d3/d3.min.js | 5390 +----------
.../main/webapp/js/jquery/combo/jquery.combo.js | 5 +-
.../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 180 -> 0 bytes
.../images/ui-bg_flat_75_ffffff_40x100.png | Bin 178 -> 0 bytes
.../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 120 -> 0 bytes
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin 105 -> 0 bytes
.../images/ui-bg_glass_75_dadada_1x400.png | Bin 111 -> 0 bytes
.../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 110 -> 0 bytes
.../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 119 -> 0 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 101 -> 0 bytes
.../images/ui-icons_222222_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_2e83ff_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_454545_256x240.png | Bin 8543 -> 0 bytes
.../images/ui-icons_888888_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_cd0a0a_256x240.png | Bin 4369 -> 0 bytes
.../images/ui-icons_ffffff_256x240.png | Bin 8358 -> 0 bytes
.../css/smoothness/jquery-ui-1.8.10.custom.css | 625 --
.../src/main/webapp/js/jquery/jquery-1.7.js | 9017 ------------------
.../src/main/webapp/js/jquery/jquery-1.7.min.js | 2934 ------
.../main/webapp/js/jquery/jquery-2.1.1.min.js | 4 +
.../js/jquery/jquery-ui-1.8.10.custom.min.js | 6354 ------------
.../js/jquery/jquery.event.drag-2.0.min.js | 194 -
.../js/jquery/jquery.event.drag-2.2.min.js | 6 +
.../src/main/webapp/js/jquery/jquery.form.js | 1118 ---
.../main/webapp/js/jquery/jquery.form.min.js | 11 +
.../js/jquery/minicolors/jquery.minicolors.css | 274 +-
.../jquery/minicolors/jquery.minicolors.min.js | 415 +-
.../main/webapp/js/jquery/qtip2/jquery.qtip.css | 557 --
.../webapp/js/jquery/qtip2/jquery.qtip.min.css | 3 +
.../webapp/js/jquery/qtip2/jquery.qtip.min.js | 711 +-
.../webapp/js/jquery/slickgrid/MIT-LICENSE.txt | 20 +
.../js/jquery/slickgrid/css/images/collapse.gif | Bin 0 -> 846 bytes
.../js/jquery/slickgrid/css/images/expand.gif | Bin 0 -> 851 bytes
.../slickgrid/css/slick-default-theme.css | 68 +-
.../js/jquery/slickgrid/css/slick.grid.css | 174 +-
.../slickgrid/plugins/slick.autotooltips.js | 121 +-
.../plugins/slick.cellrangedecorator.js | 110 +-
.../plugins/slick.cellrangeselector.js | 194 +-
.../plugins/slick.cellselectionmodel.js | 210 +-
.../plugins/slick.rowselectionmodel.js | 325 +-
.../webapp/js/jquery/slickgrid/slick.core.js | 796 +-
.../js/jquery/slickgrid/slick.dataview.js | 1920 ++--
.../webapp/js/jquery/slickgrid/slick.editors.js | 994 +-
.../js/jquery/slickgrid/slick.formatters.js | 86 +-
.../webapp/js/jquery/slickgrid/slick.grid.js | 6254 ++++++------
.../ui-smoothness/images/animated-overlay.gif | Bin 0 -> 1738 bytes
.../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 212 bytes
.../images/ui-bg_flat_75_ffffff_40x100.png | Bin 0 -> 208 bytes
.../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 335 bytes
.../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 207 bytes
.../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 262 bytes
.../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 262 bytes
.../images/ui-bg_glass_95_fef1ec_1x400.png | Bin 0 -> 332 bytes
.../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 280 bytes
.../images/ui-icons_222222_256x240.png | Bin 0 -> 6922 bytes
.../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4549 bytes
.../images/ui-icons_454545_256x240.png | Bin 0 -> 6992 bytes
.../images/ui-icons_888888_256x240.png | Bin 0 -> 6999 bytes
.../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4549 bytes
.../ui-smoothness/jquery-ui-1.10.4.min.css | 7 +
.../ui-smoothness/jquery-ui-1.10.4.min.js | 7 +
.../js/nf/bulletin-board/nf-bulletin-board.js | 16 +-
.../src/main/webapp/js/nf/canvas/nf-actions.js | 65 +-
.../src/main/webapp/js/nf/canvas/nf-birdseye.js | 1 +
.../webapp/js/nf/canvas/nf-canvas-header.js | 12 +-
.../webapp/js/nf/canvas/nf-canvas-toolbar.js | 1 +
.../webapp/js/nf/canvas/nf-canvas-toolbox.js | 45 +-
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 73 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 59 +-
.../main/webapp/js/nf/canvas/nf-clipboard.js | 4 +
.../main/webapp/js/nf/canvas/nf-connectable.js | 1 +
.../js/nf/canvas/nf-connection-configuration.js | 43 +-
.../main/webapp/js/nf/canvas/nf-connection.js | 20 +-
.../main/webapp/js/nf/canvas/nf-context-menu.js | 2 +
.../main/webapp/js/nf/canvas/nf-draggable.js | 9 +-
.../src/main/webapp/js/nf/canvas/nf-funnel.js | 8 +
.../src/main/webapp/js/nf/canvas/nf-go-to.js | 50 +-
.../src/main/webapp/js/nf/canvas/nf-graph.js | 6 +
.../js/nf/canvas/nf-label-configuration.js | 5 +-
.../src/main/webapp/js/nf/canvas/nf-label.js | 14 +-
.../js/nf/canvas/nf-port-configuration.js | 5 +-
.../main/webapp/js/nf/canvas/nf-port-details.js | 1 +
.../src/main/webapp/js/nf/canvas/nf-port.js | 10 +
.../nf/canvas/nf-process-group-configuration.js | 5 +-
.../js/nf/canvas/nf-process-group-details.js | 1 +
.../webapp/js/nf/canvas/nf-process-group.js | 10 +
.../js/nf/canvas/nf-processor-configuration.js | 13 +-
.../js/nf/canvas/nf-processor-property-table.js | 14 +
.../main/webapp/js/nf/canvas/nf-processor.js | 11 +
.../main/webapp/js/nf/canvas/nf-registration.js | 4 +-
.../nf-remote-process-group-configuration.js | 5 +-
.../canvas/nf-remote-process-group-details.js | 1 +
.../nf/canvas/nf-remote-process-group-ports.js | 13 +-
.../js/nf/canvas/nf-remote-process-group.js | 10 +
.../src/main/webapp/js/nf/canvas/nf-search.js | 26 +-
.../nf/canvas/nf-secure-port-configuration.js | 35 +-
.../js/nf/canvas/nf-secure-port-details.js | 1 +
.../main/webapp/js/nf/canvas/nf-selectable.js | 2 +
.../src/main/webapp/js/nf/canvas/nf-settings.js | 13 +-
.../src/main/webapp/js/nf/canvas/nf-snippet.js | 6 +
.../src/main/webapp/js/nf/canvas/nf-storage.js | 3 +
.../webapp/js/nf/cluster/nf-cluster-table.js | 31 +-
.../src/main/webapp/js/nf/cluster/nf-cluster.js | 12 +-
.../webapp/js/nf/counters/nf-counters-table.js | 11 +-
.../main/webapp/js/nf/counters/nf-counters.js | 12 +-
.../webapp/js/nf/history/nf-history-model.js | 4 +-
.../webapp/js/nf/history/nf-history-table.js | 7 +-
.../src/main/webapp/js/nf/history/nf-history.js | 12 +-
.../src/main/webapp/js/nf/nf-common.js | 40 +
.../main/webapp/js/nf/nf-connection-details.js | 19 +-
.../src/main/webapp/js/nf/nf-dialog.js | 1 +
.../main/webapp/js/nf/nf-processor-details.js | 5 +-
.../src/main/webapp/js/nf/nf-shell.js | 1 +
.../src/main/webapp/js/nf/nf-status-history.js | 102 +-
.../js/nf/provenance/nf-provenance-lineage.js | 17 +-
.../js/nf/provenance/nf-provenance-table.js | 37 +-
.../webapp/js/nf/provenance/nf-provenance.js | 20 +-
.../webapp/js/nf/summary/nf-cluster-search.js | 29 +-
.../webapp/js/nf/summary/nf-summary-table.js | 62 +-
.../src/main/webapp/js/nf/summary/nf-summary.js | 20 +-
.../js/nf/templates/nf-templates-table.js | 12 +-
.../main/webapp/js/nf/templates/nf-templates.js | 12 +-
.../main/webapp/js/nf/users/nf-users-table.js | 46 +-
.../src/main/webapp/js/nf/users/nf-users.js | 12 +-
.../ui/src/main/webapp/WEB-INF/jsp/index.jsp | 6 +-
.../js/jquery/jqgrid/css/ellipsis-xbl.xml | 29 -
.../webapp/js/jquery/jqgrid/css/ui.jqgrid.css | 251 +-
.../js/jquery/jqgrid/js/i18n/grid.locale-en.js | 175 +-
.../js/jquery/jqgrid/js/jquery.jqGrid.min.js | 959 +-
.../ui/src/main/webapp/js/nf-common.js | 7 +-
.../src/main/webapp/WEB-INF/jsp/worksheet.jsp | 33 +-
.../ui/src/main/webapp/css/main.css | 17 +-
.../ui/src/main/webapp/css/reset.css | 59 -
.../ui/src/main/webapp/js/application.js | 67 +-
158 files changed, 8307 insertions(+), 42974 deletions(-)
----------------------------------------------------------------------