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/08/21 23:20:45 UTC
[2/2] nifi git commit: Merge branch 'NIFI-844'
Merge branch 'NIFI-844'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/671445f1
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/671445f1
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/671445f1
Branch: refs/heads/master
Commit: 671445f10a0debfd9deba9e3444a67f84d701cfe
Parents: e824835 a9c2bf5
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Aug 21 17:15:39 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Aug 21 17:15:39 2015 -0400
----------------------------------------------------------------------
nifi-assembly/pom.xml | 6 +-
.../nifi-avro-bundle/nifi-avro-nar/pom.xml | 37 ++++++
.../src/main/resources/META-INF/NOTICE | 71 +++++++++++
.../nifi-avro-processors/.gitignore | 1 +
.../nifi-avro-processors/pom.xml | 72 +++++++++++
.../nifi/processors/avro/ConvertAvroToJSON.java | 122 ++++++++++++++++++
.../org.apache.nifi.processor.Processor | 15 +++
.../processors/avro/TestConvertAvroToJSON.java | 102 +++++++++++++++
.../src/test/resources/user.avsc | 9 ++
nifi-nar-bundles/nifi-avro-bundle/pom.xml | 35 ++++++
.../src/main/resources/META-INF/NOTICE | 18 +++
.../nifi-standard-processors/pom.xml | 2 +-
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 -
nifi-nar-bundles/pom.xml | 1 +
pom.xml | 124 +++++++++++--------
15 files changed, 561 insertions(+), 59 deletions(-)
----------------------------------------------------------------------