You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2014/12/16 21:10:58 UTC
[8/8] incubator-nifi git commit: Merge branch 'bootstrap' into develop
Merge branch 'bootstrap' 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/575cc42c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/575cc42c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/575cc42c
Branch: refs/heads/develop
Commit: 575cc42c72282b24d9a52c666a5934dbd666b116
Parents: a94cf4b c1681d9
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Dec 16 15:10:20 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Dec 16 15:10:20 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(-)
----------------------------------------------------------------------