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/06/04 19:09:33 UTC

[3/3] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

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/efc862ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/efc862ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/efc862ea

Branch: refs/heads/develop
Commit: efc862eac8f24058916b6c37c1674f2aa9577e01
Parents: fcadaa8 fb75a4b
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Jun 4 13:09:07 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Jun 4 13:09:07 2015 -0400

----------------------------------------------------------------------
 .../nifi-hl7-query-language/pom.xml             |  2 +-
 nifi/nifi-docs/pom.xml                          |  2 +-
 nifi/nifi-external/nifi-spark-receiver/pom.xml  |  1 -
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |  2 +-
 .../nifi-framework-cluster/pom.xml              |  2 +-
 .../nifi-framework/nifi-framework-core/pom.xml  |  2 +-
 .../nifi-web/nifi-web-content-viewer/pom.xml    |  2 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |  2 +-
 .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml |  2 +-
 .../nifi-solr-processors/pom.xml                |  2 +-
 .../nifi-standard-processors/pom.xml            |  2 +-
 nifi/pom.xml                                    | 45 +++++++++++---------
 12 files changed, 35 insertions(+), 31 deletions(-)
----------------------------------------------------------------------