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/11 14:54:39 UTC

[6/7] incubator-nifi git commit: Merge branch 'develop' into NIFI-250

Merge branch 'develop' into NIFI-250


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

Branch: refs/heads/NIFI-250
Commit: 3d38d8c98c180f5446b0f2dafea78eeec38e432e
Parents: 4bc5ed1 56a6bc4
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Feb 11 07:09:05 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Feb 11 07:09:05 2015 -0500

----------------------------------------------------------------------
 nifi-site/src/includes/topbar.hbs               |   1 +
 nifi-site/src/pages/html/screencasts.hbs        |  35 ++++
 .../apache/nifi/processors/standard/GetFTP.java |   5 +
 .../nifi/processors/standard/JmsConsumer.java   | 143 ++++++++-------
 .../apache/nifi/processors/standard/PutFTP.java |   7 +-
 .../apache/nifi/processors/standard/PutJMS.java |  11 +-
 .../processors/standard/util/FTPTransfer.java   |  48 ++++-
 .../standard/util/JmsProcessingSummary.java     |  83 +++++++++
 .../processors/standard/util/JmsProperties.java |   3 +-
 .../standard/util/SocksProxySocketFactory.java  |  69 ++++++++
 .../processors/standard/TestJmsConsumer.java    | 173 +++++++++++++++++++
 11 files changed, 513 insertions(+), 65 deletions(-)
----------------------------------------------------------------------