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/11/11 20:23:32 UTC
[2/2] nifi git commit: Merge branch 'NIFI-1143' of
https://github.com/olegz/nifi into NIFI-1143
Merge branch 'NIFI-1143' of https://github.com/olegz/nifi into NIFI-1143
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/854d2039
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/854d2039
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/854d2039
Branch: refs/heads/master
Commit: 854d20398242a4500b6849d2f9c7f9ec917b4ec7
Parents: 11fcad9 5baafa1
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Nov 11 14:14:54 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Nov 11 14:14:54 2015 -0500
----------------------------------------------------------------------
.../nifi/components/PropertyDescriptor.java | 25 ++++++++++++++++++--
.../TestStandardControllerServiceProvider.java | 17 +++++++++++--
2 files changed, 38 insertions(+), 4 deletions(-)
----------------------------------------------------------------------