You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2014/12/19 13:33:58 UTC
[29/43] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
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/c2bb1fd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c2bb1fd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c2bb1fd5
Branch: refs/heads/nifi-27
Commit: c2bb1fd5ba1ef4ef0e7c5b6f3b5fe6a1570947d9
Parents: 15d7031 575cc42
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Dec 16 15:35:44 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Dec 16 15:35:44 2014 -0500
----------------------------------------------------------------------
.../repository/VolatileContentRepository.java | 2 +-
.../resources/src/main/resources/bin/nifi.sh | 80 ++-
.../src/main/resources/conf/bootstrap.conf | 8 +-
.../java/org/apache/nifi/BootstrapListener.java | 46 +-
.../src/main/java/org/apache/nifi/NiFi.java | 2 -
.../apache/nifi/util/LimitingInputStream.java | 107 ++++
.../apache/nifi/bootstrap/BootstrapCodec.java | 7 +-
.../org/apache/nifi/bootstrap/NiFiListener.java | 18 +-
.../java/org/apache/nifi/bootstrap/RunNiFi.java | 496 ++++++++++++++++---
.../bootstrap/util/LimitingInputStream.java | 107 ++++
10 files changed, 749 insertions(+), 124 deletions(-)
----------------------------------------------------------------------