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/06 13:17:24 UTC
[2/2] 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/9f9466cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9f9466cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9f9466cb
Branch: refs/heads/NIFI-250
Commit: 9f9466cb418b01295ecbe727dca07e82ddda9cb5
Parents: 4a8da60 d36a71c
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Feb 6 07:17:11 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Feb 6 07:17:11 2015 -0500
----------------------------------------------------------------------
nifi-site/Gruntfile.js | 5 +++--
nifi-site/src/includes/topbar.hbs | 6 +++---
nifi-site/src/js/app.js | 2 ++
nifi-site/src/pages/html/developer-guide.hbs | 7 +++++++
nifi-site/src/pages/html/download.hbs | 2 +-
nifi-site/src/pages/html/overview.hbs | 7 +++++++
nifi-site/src/pages/html/screencasts.hbs | 15 +++++++++++++++
nifi-site/src/pages/html/user-guide.hbs | 7 +++++++
nifi-site/src/scss/app.scss | 22 ++++++++++++++++++++++
9 files changed, 67 insertions(+), 6 deletions(-)
----------------------------------------------------------------------