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 2015/11/25 19:03:34 UTC

[4/4] nifi git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e1742c5a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e1742c5a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e1742c5a

Branch: refs/heads/master
Commit: e1742c5a0414077bfd6688cc96332713b7dc7468
Parents: 4fa2a71 4281a51
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Nov 25 13:03:22 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Nov 25 13:03:22 2015 -0500

----------------------------------------------------------------------
 .../java/org/apache/nifi/processors/standard/ListenSyslog.java    | 3 ++-
 .../main/java/org/apache/nifi/processors/standard/PutSyslog.java  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------