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/NIFI-250 Commit: 629ec371cdca232c7f40991c35dc628590c11c6f Parents: bbb7f8d b0b14ed Author: Mark Payne <[email protected]> Authored: Wed Feb 4 08:02:41 2015 -0500 Committer: Mark Payne <[email protected]> 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(-) ----------------------------------------------------------------------
