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/12/03 22:35:48 UTC

[3/3] nifi git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi


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

Branch: refs/heads/master
Commit: dce039b54f2fa1fbecce5d5d5fac14f54322f32d
Parents: 76914ea 3656c88
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Dec 3 16:35:33 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Dec 3 16:35:33 2015 -0500

----------------------------------------------------------------------
 .../nifi/processors/standard/util/PasswordBasedEncryptor.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------