You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/02/04 14:02:42 UTC

[2/2] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi 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/629ec371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/629ec371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/629ec371

Branch: refs/heads/develop
Commit: 629ec371cdca232c7f40991c35dc628590c11c6f
Parents: bbb7f8d b0b14ed
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Feb 4 08:02:41 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Feb 4 08:02:41 2015 -0500

----------------------------------------------------------------------
 .gitignore                                    |   7 +
 nifi-site/src/includes/topbar.hbs             |   7 +-
 nifi-site/src/layouts/markdown.hbs            |   1 +
 nifi-site/src/pages/html/download.hbs         |  46 +++++
 nifi-site/src/pages/markdown/quickstart.md    |  14 +-
 nifi-site/src/pages/markdown/release-guide.md | 208 +++++++++++----------
 nifi-site/src/scss/_settings.scss             |  11 +-
 nifi-site/src/scss/app.scss                   |   8 +
 8 files changed, 197 insertions(+), 105 deletions(-)
----------------------------------------------------------------------