Merge branch 'NIFI-1208'

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

Branch: refs/heads/master
Commit: 4281a51c83c45382b828d4bdcd621b2972057d78
Parents: 4e2c94d 3ffb455
Author: Bryan Bende <[email protected]>
Authored: Mon Nov 23 21:35:57 2015 -0500
Committer: Bryan Bende <[email protected]>
Committed: Mon Nov 23 21:35:57 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(-)
----------------------------------------------------------------------


Reply via email to