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/19 19:16:33 UTC
[59/59] [abbrv] incubator-nifi git commit: Merge branch 'NIFI-250' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Conflicts:
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/settings.css
nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java
nifi/nar-bundles/framework-bundle/framework/web/nifi-web-api/src/main/java/org/apache/nifi/web/controller/ControllerFacade.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/b29b61a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/b29b61a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/b29b61a5
Branch: refs/heads/NIFI-250
Commit: b29b61a5a8290b1b0a5513786227d7036e37aa6b
Parents: 8976ff4 bb108a0
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Jan 19 13:15:03 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Jan 19 13:15:03 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------