Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/0594a433 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0594a433 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0594a433 Branch: refs/heads/develop Commit: 0594a433126888c458be6bc867cb4c7e3ecbd6a6 Parents: d09d58d bef65db Author: bbende <[email protected]> Authored: Mon Apr 20 18:40:05 2015 -0400 Committer: bbende <[email protected]> Committed: Mon Apr 20 18:40:05 2015 -0400 ---------------------------------------------------------------------- .../images/add-controller-service-window.png | Bin 0 -> 157241 bytes .../configure-controller-service-properties.png | Bin 0 -> 107830 bytes .../configure-controller-service-settings.png | Bin 0 -> 79718 bytes .../configure-reporting-task-properties.png | Bin 0 -> 58292 bytes .../configure-reporting-task-settings.png | Bin 0 -> 80213 bytes .../images/controller-services-edit-buttons.png | Bin 0 -> 22294 bytes .../controller-services-edit-buttons2.png | Bin 0 -> 21845 bytes .../asciidoc/images/controller-services-tab.png | Bin 0 -> 167278 bytes .../images/controller-settings-button.png | Bin 0 -> 32341 bytes .../images/create-service-ssl-context.png | Bin 0 -> 142764 bytes .../images/reporting-tasks-edit-buttons.png | Bin 0 -> 5049 bytes .../images/reporting-tasks-edit-buttons2.png | Bin 0 -> 17525 bytes .../asciidoc/images/reporting-tasks-tab.png | Bin 0 -> 161551 bytes .../asciidoc/images/settings-general-tab.png | Bin 0 -> 132657 bytes .../nifi-docs/src/main/asciidoc/user-guide.adoc | 104 +++++++++++++++---- .../standard/AbstractJsonPathProcessor.java | 25 ++++- .../processors/standard/EvaluateJsonPath.java | 57 ++++++---- .../nifi/processors/standard/SplitJson.java | 5 +- .../standard/TestEvaluateJsonPath.java | 86 +++++++++++++++ .../nifi/processors/standard/TestSplitJson.java | 88 ++++++++++++++++ 20 files changed, 322 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
