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/09/25 15:15:51 UTC

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

Merge branch 'master' of http://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/96764ed6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/96764ed6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/96764ed6

Branch: refs/heads/master
Commit: 96764ed6a14fadbc925e64c47f10e1b76256a389
Parents: eb94dab e53ab39
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Sep 25 09:15:34 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Sep 25 09:15:34 2015 -0400

----------------------------------------------------------------------
 .../nifi/processors/standard/LogAttribute.java  |  28 ++++-
 .../processors/attributes/UpdateAttribute.java  |  84 +++++++++++----
 .../additionalDetails.html                      |  25 ++++-
 .../update/attributes/TestUpdateAttribute.java  | 104 ++++++++++++++++---
 4 files changed, 204 insertions(+), 37 deletions(-)
----------------------------------------------------------------------