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/05/15 21:22:20 UTC
[2/2] incubator-nifi git commit: Merge branch 'NIFI-548' of
https://github.com/bbende/incubator-nifi into develop
Merge branch 'NIFI-548' of https://github.com/bbende/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/ca7e3c0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ca7e3c0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ca7e3c0d
Branch: refs/heads/develop
Commit: ca7e3c0daf04f1485e752a78d930b4ead944b2f8
Parents: 6787afc badf101
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri May 15 14:58:35 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri May 15 14:58:35 2015 -0400
----------------------------------------------------------------------
.../org/apache/nifi/io/nio/ChannelDispatcher.java | 6 ++++--
.../java/org/apache/nifi/io/nio/ChannelListener.java | 4 ++--
.../org/apache/nifi/io/nio/DatagramChannelReader.java | 8 ++++++--
.../org/apache/nifi/io/nio/example/ServerMain.java | 2 +-
.../apache/nifi/processors/standard/ListenUDP.java | 14 ++++++++++++--
.../processors/standard/util/UDPStreamConsumer.java | 11 +++++++----
6 files changed, 32 insertions(+), 13 deletions(-)
----------------------------------------------------------------------