Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/79ddcb82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/79ddcb82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/79ddcb82 Branch: refs/heads/NIFI-250 Commit: 79ddcb828e678e38ffb67f524bed03a72a3361dc Parents: d5a9a1a 7198912 Author: Matt Gilman <[email protected]> Authored: Fri Mar 13 06:49:10 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 13 06:49:10 2015 -0400 ---------------------------------------------------------------------- nifi/README.md | 6 +++-- .../java/org/apache/nifi/bootstrap/RunNiFi.java | 16 +++++++++-- .../client/socket/EndpointConnectionPool.java | 1 - .../nifi/processors/standard/PutEmail.java | 28 +++++++++++++++----- 4 files changed, 40 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
