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/13cd2a67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/13cd2a67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/13cd2a67 Branch: refs/heads/NIFI-271 Commit: 13cd2a67c89e2c08880247c5837360f370fc9922 Parents: 7843132 fb2206a Author: Jenn Barnabee <[email protected]> Authored: Sat Apr 18 07:05:29 2015 -0400 Committer: Jenn Barnabee <[email protected]> Committed: Sat Apr 18 07:05:29 2015 -0400 ---------------------------------------------------------------------- .../nifi-hl7-query-language/pom.xml | 3 - .../nifi/provenance/lucene/DocsReader.java | 20 ++--- .../provenance/serialization/RecordReaders.java | 41 ++++++++- .../standard/AbstractJsonPathProcessor.java | 25 +++++- .../processors/standard/EvaluateJsonPath.java | 36 ++++---- .../nifi/processors/standard/PutEmail.java | 16 +++- .../nifi/processors/standard/SplitJson.java | 5 +- .../standard/TestEvaluateJsonPath.java | 86 +++++++++++++++++++ .../nifi/processors/standard/TestSplitJson.java | 88 ++++++++++++++++++++ nifi/pom.xml | 2 +- 10 files changed, 278 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
