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 2014/12/22 21:37:28 UTC
[2/2] incubator-nifi git commit: Merge remote-tracking branch
'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' 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/13578e2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/13578e2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/13578e2d
Branch: refs/heads/develop
Commit: 13578e2d4172ab15dc840ced52a63e7766f6856a
Parents: 527bec5 6296577
Author: joewitt <jo...@apache.org>
Authored: Mon Dec 22 15:27:46 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Mon Dec 22 15:27:46 2014 -0500
----------------------------------------------------------------------
.../org/apache/nifi/web/server/JettyServer.java | 20 +-
.../framework/web/nifi-web-api/pom.xml | 6 +-
.../nifi-web-api/src/main/enunciate/default.css | 266 -------------------
.../src/main/enunciate/enunciate.xml | 4 +-
.../src/main/enunciate/images/bgcode.gif | Bin 56 -> 0 bytes
.../src/main/enunciate/images/bgcontainer.png | Bin 386 -> 0 bytes
.../src/main/enunciate/images/bgul.gif | Bin 304 -> 0 bytes
.../src/main/enunciate/images/header.png | Bin 51928 -> 0 bytes
.../src/main/enunciate/images/home.png | Bin 0 -> 144 bytes
.../src/main/enunciate/images/li.png | Bin 191 -> 0 bytes
.../src/main/enunciate/images/quote.gif | Bin 228 -> 0 bytes
.../src/main/enunciate/images/search.gif | Bin 680 -> 0 bytes
.../src/main/enunciate/override.css | 178 +++++++++++++
.../src/main/webapp/WEB-INF/web.xml | 14 +-
.../main/webapp/WEB-INF/jsp/documentation.jsp | 19 +-
.../WEB-INF/jsp/no-documentation-found.jsp | 10 +-
.../src/main/webapp/css/component-usage.css | 92 +++++--
.../nifi-web-docs/src/main/webapp/css/main.css | 29 +-
.../src/main/webapp/js/application.js | 18 +-
.../nifi-web-error/src/main/webapp/index.jsp | 1 +
.../framework/web/nifi-web-ui/pom.xml | 2 +-
21 files changed, 332 insertions(+), 327 deletions(-)
----------------------------------------------------------------------