nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcgil...@apache.org
Subject [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
Date Mon, 19 Jan 2015 18:16:33 GMT
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 <matt.c.gilman@gmail.com>
Authored: Mon Jan 19 13:15:03 2015 -0500
Committer: Matt Gilman <matt.c.gilman@gmail.com>
Committed: Mon Jan 19 13:15:03 2015 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



Mime
View raw message