Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5d90c9be Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5d90c9be Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5d90c9be Branch: refs/heads/NIFI-655 Commit: 5d90c9be07b40455c831e5a602eeeb6660cdd8c6 Parents: bd506b1 a5a5bad Author: Mark Payne <[email protected]> Authored: Fri Oct 23 09:52:33 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri Oct 23 09:52:33 2015 -0400 ---------------------------------------------------------------------- .../nifi/processors/avro/ConvertAvroToJSON.java | 49 ++++++++++++++++++-- .../processors/avro/TestConvertAvroToJSON.java | 47 +++++++++++++++++-- 2 files changed, 89 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
