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 2015/02/04 19:57:02 UTC
[08/36] incubator-nifi git commit: Merge branch 'NIFI-305' of
https://github.com/gresockj/incubator-nifi into develop
Merge branch 'NIFI-305' of https://github.com/gresockj/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/c01dff59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c01dff59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c01dff59
Branch: refs/heads/NIFI-250
Commit: c01dff5922239a28d02d407fb86f27f110aceeab
Parents: bafa945 615794e
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Feb 2 13:23:36 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Feb 2 13:23:36 2015 -0500
----------------------------------------------------------------------
.../nifi/processors/standard/BinFiles.java | 405 +++++++++++++++++++
.../nifi/processors/standard/MergeContent.java | 400 ++++--------------
2 files changed, 490 insertions(+), 315 deletions(-)
----------------------------------------------------------------------