You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nifi.apache.org by pv...@apache.org on 2018/12/18 09:21:35 UTC

[nifi] branch master updated (c52f880 -> e9cb915)

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git.


    from c52f880  Merge pull request #3224 from mattyb149/NIFI-5904
     add 4b70465  NIFI-5905 Secure S2S fails with NullPointerException
     new e9cb915  Merge pull request #3225 from ijokarumawak/nifi-5905

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../java/org/apache/nifi/controller/FlowController.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

[nifi] 01/01: Merge pull request #3225 from ijokarumawak/nifi-5905

Posted by pv...@apache.org.

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit e9cb915ca9800df4aae6b0d9f860409a38f29832
Merge: c52f880 4b70465
Author: Pierre Villard <pi...@gmail.com>
AuthorDate: Tue Dec 18 10:21:29 2018 +0100

    Merge pull request #3225 from ijokarumawak/nifi-5905
    
    NIFI-5905 Secure S2S fails with NullPointerException

 .../java/org/apache/nifi/controller/FlowController.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)