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/17 23:32:17 UTC

[2/2] nifi git commit: Merge branch 'NIFI-108' of https://git-wip-us.apache.org/repos/asf/nifi into NIFI-108

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


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

Branch: refs/heads/NIFI-108
Commit: 6d64f58d403d5a21f22e3dc29fb9c4fa922a6c4a
Parents: e18038a ab30bf0
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Dec 17 17:32:07 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Dec 17 17:32:07 2015 -0500

----------------------------------------------------------------------
 .../apache/nifi/web/api/ConnectionResource.java | 42 +++++++++++++++-----
 .../org/apache/nifi/web/api/dto/DtoFactory.java | 18 +++++++++
 .../web/dao/impl/StandardConnectionDAO.java     | 19 +++++----
 3 files changed, 62 insertions(+), 17 deletions(-)
----------------------------------------------------------------------