You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/01/03 07:52:14 UTC

[2/2] incubator-nifi git commit: Merge branch 'NIFI-201' of https://github.com/gresockj/incubator-nifi into develop

Merge branch 'NIFI-201' 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/5b4211d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/5b4211d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/5b4211d9

Branch: refs/heads/develop
Commit: 5b4211d9af444864c42caeb8c28d6ffff3161b6c
Parents: 9e35c7d b233eaf
Author: joewitt <jo...@apache.org>
Authored: Sat Jan 3 01:31:17 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Sat Jan 3 01:31:17 2015 -0500

----------------------------------------------------------------------
 .../apache/nifi/processors/standard/ListenHTTP.java   | 11 +++++++++++
 .../standard/servlets/ListenHTTPServlet.java          | 14 +++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
----------------------------------------------------------------------