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/02/09 15:48:49 UTC
[16/18] 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/c7ee77be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c7ee77be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c7ee77be
Branch: refs/heads/NIFI-250
Commit: c7ee77be9781057109021c9db6981d9905397b3e
Parents: 7da7c93 0133f84
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Feb 9 07:35:46 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Feb 9 07:35:46 2015 -0500
----------------------------------------------------------------------
nifi/LICENSE | 25 +-
nifi/nifi-assembly/LICENSE | 23 +
nifi/nifi-docs/LICENSE | 235 +++++++++++
nifi/nifi-docs/NOTICE | 5 +
nifi/nifi-docs/pom.xml | 30 +-
.../src/main/asciidoc/asciidoc-mod.css | 418 +++++++++++++++++++
.../src/main/asciidoc/developer-guide.adoc | 32 +-
.../src/main/assembly/dependencies.xml | 16 +
.../webapp/js/nf/canvas/nf-canvas-toolbox.js | 2 +-
nifi/pom.xml | 4 +-
10 files changed, 761 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c7ee77be/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-toolbox.js
----------------------------------------------------------------------