You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/01/26 13:15:19 UTC

[05/14] incubator-nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

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


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

Branch: refs/heads/NIFI-250
Commit: 8b3f3c75cd1cd4212afca998d8032455492e55de
Parents: a0b70fa 43e646e
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Jan 23 11:13:31 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Jan 23 11:13:31 2015 -0500

----------------------------------------------------------------------
 nifi-nar-maven-plugin/pom.xml                           |  5 +++--
 .../apache/nifi/web/controller/ControllerFacade.java    | 12 +++++++++---
 nifi/pom.xml                                            |  5 +++--
 3 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8b3f3c75/nifi/pom.xml
----------------------------------------------------------------------