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/041f5432 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/041f5432 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/041f5432 Branch: refs/heads/develop Commit: 041f543283aab1305c401e5da1378d502beea73c Parents: 4107a0e 3a27c37 Author: bbende <[email protected]> Authored: Thu Mar 26 21:16:51 2015 -0400 Committer: bbende <[email protected]> Committed: Thu Mar 26 21:16:51 2015 -0400 ---------------------------------------------------------------------- .../nifi/processor/util/StandardValidators.java | 8 ++++++ .../nifi/processors/standard/InvokeHTTP.java | 29 +++++++------------- .../cache/protocol/ProtocolHandshake.java | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
