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 2014/12/16 16:57:28 UTC
[8/9] incubator-nifi git commit: Merge branch 'develop' into NIFI-169
Merge branch 'develop' into NIFI-169
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3a4c6ed8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3a4c6ed8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3a4c6ed8
Branch: refs/heads/NIFI-169
Commit: 3a4c6ed887cd2e13aa861ed99028de33678bcbe8
Parents: 614349b 1cc3ce5
Author: joewitt <jo...@apache.org>
Authored: Tue Dec 16 08:16:52 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Tue Dec 16 08:16:52 2014 -0500
----------------------------------------------------------------------
.../nifi/controller/FileSystemSwapManager.java | 33 ++++++---
.../apache/nifi/controller/FlowController.java | 20 +++---
.../org/apache/nifi/util/ReflectionUtils.java | 72 +++++++++++---------
.../processors/standard/TestScanContent.java | 2 +-
.../nifi/components/PropertyDescriptor.java | 2 +-
.../repository/FlowFileSwapManager.java | 5 +-
.../nifi/components/TestPropertyDescriptor.java | 59 ++++++++++++++++
7 files changed, 142 insertions(+), 51 deletions(-)
----------------------------------------------------------------------