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/23 15:32:12 UTC
[4/4] incubator-nifi git commit: Merge branch 'develop' into NIFI-250
Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/cb4c654c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cb4c654c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cb4c654c
Branch: refs/heads/NIFI-250
Commit: cb4c654c7f244ee7222fb444ccca096b8f56e164
Parents: e604caf 43e646e
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jan 23 09:30:27 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jan 23 09:30:27 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/cb4c654c/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
----------------------------------------------------------------------