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/e9402a0d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e9402a0d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e9402a0d Branch: refs/heads/develop Commit: e9402a0ddc0ef9f5c0aa47e34a6726610d1b71c1 Parents: a9ef5ec c5b961b Author: bbende <[email protected]> Authored: Fri Apr 17 18:06:14 2015 -0400 Committer: bbende <[email protected]> Committed: Fri Apr 17 18:06:14 2015 -0400 ---------------------------------------------------------------------- .../nifi-hl7-query-language/pom.xml | 3 -- .../nifi/provenance/lucene/DocsReader.java | 20 +++++----- .../provenance/serialization/RecordReaders.java | 41 ++++++++++++++++++-- .../nifi/processors/standard/PutEmail.java | 16 ++++++-- nifi/pom.xml | 2 +- 5 files changed, 61 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e9402a0d/nifi/pom.xml ----------------------------------------------------------------------
