Merge branch 'NIFI-842'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/310347fd Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/310347fd Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/310347fd Branch: refs/heads/master Commit: 310347fd6608f3f23318afff5bfed9c4f94c842d Parents: 58aedd7 3bfe830 Author: Bryan Bende <[email protected]> Authored: Mon Aug 24 18:58:56 2015 -0400 Committer: Bryan Bende <[email protected]> Committed: Mon Aug 24 18:58:56 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/bootstrap/BootstrapCodec.java | 16 ++++++++++ .../java/org/apache/nifi/bootstrap/RunNiFi.java | 30 +++++++++++++++++- .../java/org/apache/nifi/BootstrapListener.java | 32 +++++++++++++++----- .../src/main/java/org/apache/nifi/NiFi.java | 4 +++ 4 files changed, 74 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
