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 2015/08/16 22:24:28 UTC
nifi-site git commit: NIFI-857
Repository: nifi-site
Updated Branches:
refs/heads/master e5f1684fa -> e64050a6b
NIFI-857
Project: http://git-wip-us.apache.org/repos/asf/nifi-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-site/commit/e64050a6
Tree: http://git-wip-us.apache.org/repos/asf/nifi-site/tree/e64050a6
Diff: http://git-wip-us.apache.org/repos/asf/nifi-site/diff/e64050a6
Branch: refs/heads/master
Commit: e64050a6b3b5137af2a57e182a88232fddfb46e8
Parents: e5f1684
Author: joewitt <jo...@apache.org>
Authored: Sun Aug 16 16:24:20 2015 -0400
Committer: joewitt <jo...@apache.org>
Committed: Sun Aug 16 16:24:20 2015 -0400
----------------------------------------------------------------------
.gitignore | 10 +++++-----
src/pages/markdown/quickstart.md | 15 +++++----------
src/pages/markdown/release-guide.md | 16 +++++++---------
3 files changed, 17 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi-site/blob/e64050a6/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5dacd2a..d0335c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,8 +15,8 @@ nb-configuration.xml
*~
# nifi site
-/nifi-site/nbproject/
-/nifi-site/bower_components/
-/nifi-site/dist/
-/nifi-site/node_modules/
-/nifi-site/.sass-cache
+nbproject/
+bower_components/
+dist/
+node_modules/
+.sass-cache
http://git-wip-us.apache.org/repos/asf/nifi-site/blob/e64050a6/src/pages/markdown/quickstart.md
----------------------------------------------------------------------
diff --git a/src/pages/markdown/quickstart.md b/src/pages/markdown/quickstart.md
index 9832ed0..309d8f4 100644
--- a/src/pages/markdown/quickstart.md
+++ b/src/pages/markdown/quickstart.md
@@ -6,13 +6,9 @@ title: Apache NiFi Development Quickstart
## Source Code
-Apache NiFi source code is version controlled using [Git][git] version control ([browse][gitbrowse]|[checkout][gitrepo]).
-
-The code is also mirrored to [Github][githubrepo]
-
-The NiFi website source code ([browse][gitbrowsenifisite]|[checkout][gitreponifisite]).
-
-The NiFi Nar maven plugin source code ([browse][gitbrowsenifimaven]|[checkout][gitreponifimaven]).
+Apache NiFi source code is version controlled using [Git][git] version control ([browse][gitbrowse]|[checkout][gitrepo]) and mirrored to [Github][githubrepo].
+<br />The NiFi website source code is available ([browse][gitbrowsenifisite]|[checkout][gitreponifisite]).
+<br />The NiFi Nar maven plugin source code is available ([browse][gitbrowsenifimaven]|[checkout][gitreponifimaven]).
## Issue Tracking
@@ -43,11 +39,10 @@ To check out the code:
git clone http://git-wip-us.apache.org/repos/asf/nifi.git
```
<br/>
-Then checkout the 'develop' branch
+Then checkout the 'master' branch (which should be the default)
```
-cd nifi/
-git checkout develop
+git checkout master
```
<br/>
http://git-wip-us.apache.org/repos/asf/nifi-site/blob/e64050a6/src/pages/markdown/release-guide.md
----------------------------------------------------------------------
diff --git a/src/pages/markdown/release-guide.md b/src/pages/markdown/release-guide.md
index ce56fa6..12efac0 100644
--- a/src/pages/markdown/release-guide.md
+++ b/src/pages/markdown/release-guide.md
@@ -69,15 +69,15 @@ when evaluating a release for a vote.
Follow the steps outlined in the [Quickstart Guide][quickstart-guide]
```
-At this point you're on the latest 'develop' branch and are able to build the entire application
+At this point you're on the latest 'master' branch and are able to build the entire application
```
<br/>
Create a JIRA ticket for the release tasks and use that ticket number for the commit messages. For example we'll consider NIFI-270 as our ticket. Also
have in mind the release version you are planning for. For example we'll consider '0.0.1'.
-Create the next version in JIRA if necessary so develop work can continue towards that release.
+Create the next version in JIRA if necessary so work can continue towards that release.
-Create new branch off develop named after the JIRA ticket or just use the develop branch itself. Here we'll use a branch off of develop with
+Create new branch off 'master' named after the JIRA ticket. Here we'll use a branch off of 'master' with
`git checkout -b NIFI-270-RC1`
Verify that Maven has sufficient heap space to perform the build tasks. Some plugins and parts of the build
@@ -236,15 +236,13 @@ Here are the steps of the release once the release is approved:
4. Merge the release branch into master
-5. Merge the release branch into develop
+5. Update the NiFi website to point to the new download(s)
-6. Update the NiFi website to point to the new download(s)
+6. Update the NiFi Web Page to indicate NEWS of the release as appropriate
-7. Update the NiFi Web Page to indicate NEWS of the release as appropriate
+7. In Jira mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console.
-8. In Jira mark the release version as 'Released' and 'Archived' through 'version' management in the 'administration' console.
-
-9. Wait 24 hours then send release announcement.
+8. Wait 24 hours then send release announcement.
- See [here][release-announce] for an understanding of why you need to wait 24 hours
- Then create an announcement like the one shown below addressed to 'announce@apache.org, dev@nifi..apache.org' with a reply-to of 'dev@nifi.apache.org'.
- The email has to be sent from an apache.org email address and should be by the release manager of the build.