You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/01/12 03:58:55 UTC

[1/2] incubator-nifi git commit: NIFI-240 replaced logo images with submitted images. Holding in branch pending reesults of vote

Repository: incubator-nifi
Updated Branches:
  refs/heads/develop aaa2992cf -> 67362a990


NIFI-240 replaced logo images with submitted images.  Holding in branch pending reesults of vote


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

Branch: refs/heads/develop
Commit: a76e91bcc5dc1df06bc46d490ef025f26a33129c
Parents: d08cda1
Author: joewitt <jo...@apache.org>
Authored: Fri Jan 9 00:03:10 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Fri Jan 9 00:03:10 2015 -0500

----------------------------------------------------------------------
 .../src/main/webapp/images/bg-error.png         | Bin 90275 -> 63766 bytes
 .../src/main/webapp/images/bgNifiLogo.png       | Bin 1682 -> 4232 bytes
 .../src/main/webapp/images/loadAnimation.gif    | Bin 7854 -> 10789 bytes
 .../src/main/webapp/images/nifi16.ico           | Bin 1150 -> 1150 bytes
 .../src/main/webapp/images/nifi_about.png       | Bin 18958 -> 16323 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a76e91bc/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png
index 5940c23..c279553 100755
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png and b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bg-error.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a76e91bc/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
index 56cf726..d92c484 100755
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png and b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a76e91bc/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif
index 67175c8..55e75dc 100755
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif and b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/loadAnimation.gif differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a76e91bc/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico
index 45fd61c..2ac3670 100755
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico and b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi16.ico differ

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/a76e91bc/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png
index 1630723..0fb90ca 100755
Binary files a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png and b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/images/nifi_about.png differ


[2/2] incubator-nifi git commit: Merge branch 'NIFI-240' into develop

Posted by jo...@apache.org.
Merge branch 'NIFI-240' 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/67362a99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67362a99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67362a99

Branch: refs/heads/develop
Commit: 67362a99084d7c50304d43df846c840ab965923d
Parents: aaa2992 a76e91b
Author: joewitt <jo...@apache.org>
Authored: Sun Jan 11 21:40:43 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Sun Jan 11 21:40:43 2015 -0500

----------------------------------------------------------------------
 .../src/main/webapp/images/bg-error.png         | Bin 90275 -> 63766 bytes
 .../src/main/webapp/images/bgNifiLogo.png       | Bin 1682 -> 4232 bytes
 .../src/main/webapp/images/loadAnimation.gif    | Bin 7854 -> 10789 bytes
 .../src/main/webapp/images/nifi16.ico           | Bin 1150 -> 1150 bytes
 .../src/main/webapp/images/nifi_about.png       | Bin 18958 -> 16323 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------