nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarna...@apache.org
Subject [3/6] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Date Tue, 24 Feb 2015 18:48:16 GMT
Merge branch 'develop' of http://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/b6f40264
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b6f40264
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b6f40264

Branch: refs/heads/develop
Commit: b6f40264e8c5c8ec7a15597c7886538f82748a99
Parents: 1c8d005 d76fe22
Author: Jenn Barnabee <jennifer.barnabee@gmail.com>
Authored: Fri Feb 20 10:41:06 2015 -0500
Committer: Jenn Barnabee <jennifer.barnabee@gmail.com>
Committed: Fri Feb 20 10:41:06 2015 -0500

----------------------------------------------------------------------
 README.md                                       |   2 +-
 nifi/README.md                                  |   2 +-
 nifi/nifi-api/pom.xml                           |   1 -
 nifi/nifi-assembly/pom.xml                      |   1 -
 .../nifi-data-provenance-utils/pom.xml          |   1 -
 .../nifi-expression-language/pom.xml            |   1 -
 .../nifi-commons/nifi-flowfile-packager/pom.xml |   1 -
 nifi/nifi-commons/nifi-logging-utils/pom.xml    |   1 -
 .../nifi-processor-utilities/pom.xml            |   1 -
 nifi/nifi-commons/nifi-properties/pom.xml       |   1 -
 nifi/nifi-commons/nifi-security-utils/pom.xml   |   1 -
 nifi/nifi-commons/nifi-socket-utils/pom.xml     |   1 -
 nifi/nifi-commons/nifi-web-utils/pom.xml        |   1 -
 nifi/nifi-commons/nifi-write-ahead-log/pom.xml  |   1 -
 nifi/nifi-mock/pom.xml                          |   1 -
 .../nifi-framework-nar/pom.xml                  |   1 -
 .../nifi-framework/nifi-administration/pom.xml  |   1 -
 .../nifi-cluster-protocol/pom.xml               |   1 -
 .../nifi-file-authorization-provider/pom.xml    |   1 -
 .../nifi-framework-core-api/pom.xml             |   1 -
 .../nifi-framework/nifi-security/pom.xml        |   1 -
 .../nifi-framework/nifi-site-to-site/pom.xml    |   1 -
 .../nifi-framework/nifi-user-actions/pom.xml    |   1 -
 .../partials/canvas/fill-color-dialog.jsp       |   6 +-
 .../nifi-web-ui/src/main/webapp/css/dialog.css  |   6 +-
 .../src/main/webapp/js/nf/canvas/nf-actions.js  |  46 ++++++--
 .../webapp/js/nf/canvas/nf-canvas-header.js     | 114 ++++++++++++-------
 .../webapp/js/nf/canvas/nf-canvas-toolbar.js    |  18 +--
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js |  25 ++++
 .../main/webapp/js/nf/canvas/nf-context-menu.js |   7 +-
 .../webapp/js/nf/cluster/nf-cluster-table.js    |   8 +-
 .../webapp/js/nf/counters/nf-counters-table.js  |   2 +-
 .../js/nf/provenance/nf-provenance-table.js     |   4 +-
 .../webapp/js/nf/summary/nf-summary-table.js    |  14 +--
 .../js/nf/templates/nf-templates-table.js       |   6 +-
 .../main/webapp/js/nf/users/nf-users-table.js   |   2 +-
 .../nifi-framework/pom.xml                      |   1 -
 .../nifi-framework-bundle/pom.xml               |   1 -
 .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml  |   1 -
 .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml |   1 -
 .../nifi-hadoop-libraries-nar/pom.xml           |   1 -
 .../nifi-hadoop-libraries-bundle/pom.xml        |   1 -
 nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml |   2 -
 .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml    |   1 -
 nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml |   2 +-
 .../nifi-provenance-repository-nar/pom.xml      |   1 -
 .../nifi-provenance-repository-bundle/pom.xml   |   1 -
 .../nifi-standard-nar/pom.xml                   |   1 -
 .../nifi/processors/standard/EvaluateXPath.java |   2 +-
 .../nifi-standard-bundle/pom.xml                |   1 -
 .../nifi-distributed-cache-services-nar/pom.xml |   1 -
 .../pom.xml                                     |   1 -
 .../nifi-load-distribution-service-api/pom.xml  |   1 -
 .../nifi-ssl-context-nar/pom.xml                |   1 -
 .../nifi-ssl-context-bundle/pom.xml             |   1 -
 .../nifi-standard-services-api-nar/pom.xml      |   1 -
 .../nifi-standard-services/pom.xml              |   1 -
 .../nifi-update-attribute-nar/pom.xml           |   2 -
 .../nifi-update-attribute-bundle/pom.xml        |   3 -
 nifi/nifi-nar-bundles/pom.xml                   |   3 -
 60 files changed, 170 insertions(+), 145 deletions(-)
----------------------------------------------------------------------



Mime
View raw message