Merge branch 'develop' of https://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/e2227cda Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e2227cda Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e2227cda Branch: refs/heads/develop Commit: e2227cdafadabf9d8e57437a5b71bc01d21d3367 Parents: be50793 efc862e Author: Matt Gilman <[email protected]> Authored: Thu Jun 4 13:10:27 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Jun 4 13:10:27 2015 -0400 ---------------------------------------------------------------------- .../nifi-hl7-query-language/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- .../nifi-aws-bundle/nifi-aws-processors/pom.xml | 2 +- .../nifi-framework-cluster/pom.xml | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../repository/StandardProcessSession.java | 173 ++++++++++--------- .../nifi-web/nifi-web-content-viewer/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 2 +- .../nifi-mongodb-processors/pom.xml | 31 ---- .../nifi/processors/mongodb/GetMongoTest.java | 4 +- .../nifi/processors/mongodb/PutMongoTest.java | 8 +- .../nifi-solr-processors/pom.xml | 2 +- .../nifi-standard-processors/pom.xml | 2 +- 14 files changed, 106 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
