You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/02/07 07:47:55 UTC
[1/3] incubator-rocketmq-site git commit: Add release manual
Repository: incubator-rocketmq-site
Updated Branches:
refs/heads/master c786832de -> 34dc0f2c4
Add release manual
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/commit/81e2520d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/81e2520d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/81e2520d
Branch: refs/heads/master
Commit: 81e2520dba7687ea4bc8d7a0db7db4db91feeb7e
Parents: c786832
Author: yukon <yu...@apache.org>
Authored: Tue Feb 7 13:19:44 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Feb 7 13:19:44 2017 +0800
----------------------------------------------------------------------
_data/navigation.yml | 11 +-
_docs/08-release-manual.md | 312 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 322 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/81e2520d/_data/navigation.yml
----------------------------------------------------------------------
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 55d271a..b068bb2 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -27,12 +27,16 @@ docs:
url: /docs/cli-admin-tool/
- title: "Cluster Configuration & Deployment"
url: /docs/cluster-deployment/
- - title: Contributor Guide
+ - title: Developer Guide
children:
- title: "Code Guidelines"
url: /docs/code-guidelines/
+ - title: "Branching model"
+ url: /docs/branching-model
- title: "Best Practice in PR"
url: /docs/pull-request/
+ - title: "Release Manual"
+ url: /docs/release-manual
- title: Best Practice
children:
- title: "Broker"
@@ -43,6 +47,11 @@ docs:
url: /docs/best-practice-consumer/
- title: "NameServer"
url: /docs/best-practice-namesvr/
+ - title: Release Notes
+ children:
+ - title: "Download"
+ - title: "4.0.0-incubating"
+ url: /release_notes/release-notes-4.0.0-incubating/
- title: FAQ
url: /docs/faq/
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/81e2520d/_docs/08-release-manual.md
----------------------------------------------------------------------
diff --git a/_docs/08-release-manual.md b/_docs/08-release-manual.md
new file mode 100644
index 0000000..1ea047a
--- /dev/null
+++ b/_docs/08-release-manual.md
@@ -0,0 +1,312 @@
+---
+title: "Release Manual"
+permalink: /docs/release-manual
+excerpt: "Apache RocketMQ Release Manual"
+modified: 2017-02-7T15:01:43-04:00
+---
+
+{% include toc %}
+
+This is a guide to making a release of Apache RocketMQ (incubating). Please follow the steps below.
+
+## Preliminaries
+### Apache Release Documentation
+There are some release documentations provided by The ASF, including the incubator release documentation, can be found here:
+
+* [Apache Release Guide](http://www.apache.org/dev/release-publishing)
+* [Apache Release Policy](http://www.apache.org/dev/release.html)
+* [Apache Incubator Release Guidelines](http://incubator.apache.org/guides/releasemanagement.html)
+* [Apache Incubator Release Policy](http://incubator.apache.org/incubation/Incubation_Policy.html#Releases)
+* [Maven Release Info](http://www.apache.org/dev/publishing-maven-artifacts.html)
+
+### Code Signing Key
+Create a code signing gpg key for release signing, use **\<your Apache ID\>@apache.org** as your primary ID for the code signing key. See the [Apache Release Signing documentation](https://www.apache.org/dev/release-signing) for more details.
+
+* Create new pgp key. How to use pgp please refer to [here](http://www.apache.org/dev/openpgp.html).
+* Generate a new key via `gpg --gen-key`, and answer 4096 bits with no expiration time.
+* Upload your key to a public key server, like `gpg --keyserver pgpkeys.mit.edu --send-key <your key id>`.
+* Get the key signed by other committers(Optional).
+* Add the key to the RocketMQ [KEYS file](https://dist.apache.org/repos/dist/dev/incubator/rocketmq/KEYS).
+
+**Tips:** If you have more than one key in your gpg, set the code signing key to `~/.gnupg/gpg.conf` as default key is recommended.
+
+### Prepare Your Maven Settings
+Make sure that your Maven settings.xml file contains the following:
+
+```xml
+<settings>
+ <profiles>
+ <profile>
+ <id>signed_release</id>
+ <properties>
+ <mavenExecutorId>forked-path</mavenExecutorId>
+ <gpg.keyname>yourKeyName</gpg.keyname>
+ <username>yourApacheID</username>
+ <deploy.url>https://dist.apache.org/repos/dist/dev/incubator/rocketmq/</deploy.url>
+ </properties>
+ </profile>
+ </profiles>
+ <servers>
+ <!-- To publish a snapshot of some part of Maven -->
+ <server>
+ <id>apache.snapshots.https</id>
+ <username>yourApacheID</username>
+ <password>yourApachePassword</password>
+ </server>
+ <!-- To stage a release of some part of Maven -->
+ <server>
+ <id>apache.releases.https</id>
+ <username>yourApacheID</username>
+ <password>yourApachePassword</password>
+ </server>
+ <server>
+ <id>gpg.passphrase</id>
+ <passphrase>yourKeyPassword</passphrase>
+ </server>
+ </servers>
+</settings>
+```
+
+**Tips:** It is highly recommended to use [Maven's password encryption capabilities](http://maven.apache.org/guides/mini/guide-encryption.html) for your passwords.
+
+### Cleanup JIRA issues
+Cleanup JIRA issues related to this release version, and check all the issues has been marked with right version in the `FixVersion` field.
+
+### Publish the Release Notes
+Generate the release notes via [RocketMQ JIRA](https://issues.apache.org/jira/browse/ROCKETMQ/) and publish it to the [rocketmq-site](https://github.com/apache/incubator-rocketmq-site), there is a [release notes](http://rocketmq.incubator.apache.org/release_notes/release-notes-4.0.0-incubating/) of `4.0.0-incubating` available for reference, include the link to the release notes in the voting emails.
+
+## Build the Release Candidate
+Firstly, checkout a new branch from `master` with its name equal to the release version, like `4.0.0-incubating`.
+
+### Build the Candidate Release Artifacts
+Before building the release artifacts, do some verifications below:
+
+* Ensure that now your are in the candidate release branch.
+* Ensure that all the unit tests can pass via `mvn clean install`.
+* Ensure that all the integration tests can pass via `mvn clean test -Pit-test`.
+
+Perform the following to generate and stage the artifacts:
+
+1. `mvn clean release:clean`
+2. `mvn release:prepare -Psigned_release -Darguments="-DskipTests"`, answer the right release version, SCM release tag, and the new development version.
+3. `mvn -Psigned_release release:perform -Darguments="-DskipTests"`, generate the artifacts and push them to the [Nexus repo](https://repository.apache.org/#stagingRepositories). If you would like to perform a dry run first (without pushing the artifacts to the repo), add the arg -DdryRun=true
+
+Now, the candidate release artifacts can be found in the [Nexus staging repo](https://repository.apache.org/#stagingRepositories) and in the `target` folder of your local branch.
+
+**Tips:** If you are performing a source-only release, please remove all artifacts from the staging repo except for the .zip file containing the source and the javadocs jar file. In the Nexus GUI, you can right click on each artifact to be deleted and then select `Delete`.
+
+### Validate the Release Candidate
+Now the release candidate is ready, before calling a vote, the artifacts must satisfy the following checklist:
+
+* Checksums and PGP signatures are valid.
+* Build is successful including unit and integration tests.
+* DISCLAIMER is correct, filenames include \u201cincubating\u201d.
+* LICENSE and NOTICE files are correct and dependency licenses are acceptable.
+* All source files have license headers where appropriate, RAT checks pass
+* Javadocs have been generated correctly and are accurate.
+* The provenance of all source files is clear (ASF or software grants).
+
+Please follow the steps below to verify the checksums and PGP signatures:
+
+1. Download the release artifacts, PGP signature file, MD5/SHA hash files.
+2. On unix platforms the following command can be executed:
+
+ ```shell
+ for file in `find . -type f -iname '*.asc'`
+ do
+ gpg --verify ${file}
+ done
+ ```
+
+ or
+
+ ```shell
+ gpg --verify rocketmq-all-%version-number%-incubating-source-release.zip.asc rocketmq-all-%version-number%-incubating-source-release.zip
+ ```
+ Check the output to ensure it contains only good signatures:
+
+ ```text
+ gpg: Good signature from ... gpg: Signature made ...
+ ```
+
+3. Compare MD5, SHA hash generated from the below command with the downloaded hash files.
+
+ ```shell
+ gpg --print-mds rocketmq-all-%version-number%-incubating-source-release.zip
+ ```
+
+### Release Artifacts to Dev-Repository
+If the release candidate appears to pass the validation checklist, close the staging repository in Nexus by selecting the staging repository `orgapacherocketmq-XXX` and clicking on the `Close` icon.
+
+Nexus will now run through a series of checksum and signature validations.
+
+If the checks pass, Nexus will close the repository and give a URL to the closed staging repo (which contains the candidate artifacts). Include this URL in the voting email so that folks can find the staged candidate release artifacts.
+
+If the checks do not pass, fix the issues, roll back and restart the release process.
+
+If everything is ok, use svn to copy the candidate release artifacts to RocketMQ repo: https://dist.apache.org/repos/dist/dev/incubator/rocketmq/${release version}.
+
+## Vote on the Release
+
+As per the Apache Incubator [release guidelines](http://incubator.apache.org/incubation/Incubation_Policy.html#Releases), all releases for incubating projects must go through a two-step voting process. First, release voting must successfully pass within the Apache RocketMQ community via the **dev@rocketmq.incubator.apache.org** mailing list. Then, release voting must successfully pass within the Apache Incubator PMC via the **general@incubator.apache.org** mailing list.
+
+General information regarding the Apache voting process can be found [here](http://www.apache.org/foundation/voting.html).
+
+### Apache RocketMQ Community Vote
+To vote on a candidate release, send an email to the [dev list](mailto:dev@rocketmq.apache.incubator.org) with subject **[VOTE]: Release Apache RocketMQ \<release version\>(incubating)** and a body along the lines of:
+
+
+
+> Hello RocketMQ Community,
+>
+> This is the vote for \<release version\> of Apache RocketMQ (incubating).
+>
+> **The artifacts:**
+> https://dist.apache.org/repos/dist/dev/incubator/rocketmq/${release version}
+>
+> **The staging repo:**
+> https://repository.apache.org/content/repositories/orgapacherocketmq-XXX/
+>
+> **Git tag for the release:**
+> \<link to the tag of GitHub repo\>
+>
+> **Hash for the release tag:**
+> \<Hash value of the release tag\>
+>
+> **Release Notes:**
+> \<insert link to the rocketmq release notes\>
+>
+> The artifacts have been signed with Key : \<ID of signing key\>, which can be found in the keys file:
+> https://dist.apache.org/repos/dist/dev/incubator/rocketmq/KEYS
+>
+> The vote will be open for at least 72 hours or until necessary number of votes are reached.
+>
+> Please vote accordingly:
+>
+> [ ] +1 approve
+> [ ] +0 no opinion
+> [ ] -1 disapprove with the reason
+>
+> Thanks,
+> The Apache RocketMQ Team
+
+Once 72 hours has passed (which is generally preferred) and/or at least three +1 (binding) votes have been cast with no -1 (binding) votes, send an email closing the vote and pronouncing the release candidate a success. Please use the subject: **[RESULT][VOTE]: Release Apache RocketMQ \<release version\>(incubating)** :
+
+> Hello RocketMQ Community,
+>
+> The Apache RocketMQ <release version> vote is now closed and has passed with [number] binding +1s, [number] non-binding +1s and no 0 or -1:
+>
+> **Binding votes +1s:**
+> User Name (Apache ID)
+> User Name (Apache ID)
+> User Name (Apache ID)
+> ....
+>
+> **Non-binding votes +1s:**
+> User Name (Apache ID)
+> ....
+>
+> A vote Apache RocketMQ \<release version\> will now be called on general@incubator.apache.org.
+>
+> Thanks,
+> The Apache RocketMQ Team
+
+### Incubator PMC Vote
+Once the candidate release vote passes on dev@rocketmq, send an email to [IMPC](mailto:dev@general@incubator.apache.org) with subject **[VOTE]: Release Apache RocketMQ \<release version\>(incubating)** and a body along the lines of:
+
+> Hello Incubator PMC,
+>
+> The Apache RocketMQ community has voted and approved the proposal to release Apache RocketMQ \<release version\> (incubating). We now kindly request the IPMC review and vote on this incubator release.
+>
+> **[VOTE] Thread:**
+> \<link to the dev voting mail-archive\>
+>
+> **[RESULT][VOTE] Thread:**
+> \<link to the dev voting mail-archive\>
+>
+> **The artifacts:**
+> https://dist.apache.org/repos/dist/dev/incubator/rocketmq/${release version}
+>
+> **The staging repo:**
+> https://repository.apache.org/content/repositories/orgapacherocketmq-XXX/
+>
+> **Git tag for the release:**
+> \<link to the tag of GitHub repo\>
+>
+> **Hash for the release tag:**
+> \<Hash value of the release tag\>
+>
+> **Release Notes:**
+> \<insert link to the rocketmq release notes\>
+>
+> The artifacts have been signed with Key : \<ID of signing key\>, which can be found in the keys file:
+> https://dist.apache.org/repos/dist/dev/incubator/rocketmq/KEYS
+>
+> The vote will be open for at least 72 hours or until necessary number of votes are reached.
+>
+> Please vote accordingly:
+>
+> [ ] +1 approve
+> [ ] +0 no opinion
+> [ ] -1 disapprove with the reason
+>
+> Thanks,
+> The Apache RocketMQ Team
+
+Also don't forget announce the vote result:
+
+> Hello Incubator PMC,
+>
+> The Apache RocketMQ <release version> vote is now closed and has passed wit [number] binding +1s, [number] non-binding +1s and no 0 or -1:
+>
+> **Binding votes +1s:**
+> User Name (Apache ID)
+> User Name (Apache ID)
+> User Name (Apache ID)
+> ....
+>
+> **Non-binding votes +1s:**
+> User Name (Apache ID)
+> ....
+>
+> The Apache RocketMQ (incubating) community will proceed with the release.
+>
+> Thanks,
+> The Apache RocketMQ Team
+
+## Publish the Release
+Once the Apache RocketMQ PPMC and IPMC votes both pass, publish the release artifacts to the Nexus Maven repository and to the Apache release repository.
+
+1. Publish the Maven Artifacts, release the Maven artifacts in Nexus by selecting the staging repository **orgapacherocketmq-XXX** and clicking on the `Release` icon.
+2. Publish the Artifacts to the Apache Release Repository, use svn copy candidate release artifacts to https://dist.apache.org/repos/dist/release/incubator/rocketmq/${release version}
+
+## Announce the Release
+Send an email to **announce@apache.org**, **general@incubator.apache.org**, and **dev@rocketmq.apache.incubator.org** with the subject **[ANNOUNCE] Release Apache RocketMQ \<release version\>(incubating)** and a body along the lines of:
+
+> Hi all,
+>
+> The Apache RocketMQ team would like to announce the release of Apache RocketMQ \<release version\>.
+>
+> More details regarding Apache RocketMQ can be found at:
+> http://rocketmq.incubator.apache.org/
+>
+> The release artifacts can be downloaded here:
+> https://dist.apache.org/repos/dist/release/incubator/rocketmq/${release version}
+>
+> The release notes can be found here:
+> \<insert link to the rocketmq release notes\>
+>
+> Thanks,
+> The Apache RocketMQ Team
+>
+> --- DISCLAIMER Apache RocketMQ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code,it does indicate that the project has yet to be fully endorsed by the ASF.
+
+## References
+
+[1]. http://pirk.incubator.apache.org/releasing
+[2]. http://htrace.incubator.apache.org/building.html
+[3]. http://slider.incubator.apache.org/developing/releasing.html
+[4]. http://streams.incubator.apache.org/release-management.html
+
+
+
[2/3] incubator-rocketmq-site git commit: Add branching model
Posted by yu...@apache.org.
Add branching model
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/commit/de7c1e27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/de7c1e27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/de7c1e27
Branch: refs/heads/master
Commit: de7c1e27e4c60d5b81c7b54ee03b080c813990b0
Parents: 81e2520
Author: yukon <yu...@apache.org>
Authored: Tue Feb 7 13:38:03 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Feb 7 13:38:03 2017 +0800
----------------------------------------------------------------------
_data/navigation.yml | 2 +-
_docs/08-release-manual.md | 8 +-
_docs/09-branching-model.md | 149 +++++++++++++++++++
...2017-01-24-release-notes-4.0.0-incubating.md | 5 -
assets/images/release-manual/14864364524873.jpg | Bin 0 -> 347275 bytes
assets/images/release-manual/14864365609580.jpg | Bin 0 -> 84289 bytes
assets/images/release-manual/14864367062507.jpg | Bin 0 -> 45304 bytes
assets/images/release-manual/14864368514198.jpg | Bin 0 -> 87040 bytes
assets/images/release-manual/14864376551544.jpg | Bin 0 -> 103860 bytes
home.md | 5 +-
10 files changed, 158 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/_data/navigation.yml
----------------------------------------------------------------------
diff --git a/_data/navigation.yml b/_data/navigation.yml
index b068bb2..a92163a 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -31,7 +31,7 @@ docs:
children:
- title: "Code Guidelines"
url: /docs/code-guidelines/
- - title: "Branching model"
+ - title: "Branching Model"
url: /docs/branching-model
- title: "Best Practice in PR"
url: /docs/pull-request/
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/_docs/08-release-manual.md
----------------------------------------------------------------------
diff --git a/_docs/08-release-manual.md b/_docs/08-release-manual.md
index 1ea047a..2933904 100644
--- a/_docs/08-release-manual.md
+++ b/_docs/08-release-manual.md
@@ -303,10 +303,10 @@ Send an email to **announce@apache.org**, **general@incubator.apache.org**, and
## References
-[1]. http://pirk.incubator.apache.org/releasing
-[2]. http://htrace.incubator.apache.org/building.html
-[3]. http://slider.incubator.apache.org/developing/releasing.html
-[4]. http://streams.incubator.apache.org/release-management.html
+[1]. http://pirk.incubator.apache.org/releasing
+[2]. http://htrace.incubator.apache.org/building.html
+[3]. http://slider.incubator.apache.org/developing/releasing.html
+[4]. http://streams.incubator.apache.org/release-management.html
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/_docs/09-branching-model.md
----------------------------------------------------------------------
diff --git a/_docs/09-branching-model.md b/_docs/09-branching-model.md
new file mode 100644
index 0000000..9bde9c4
--- /dev/null
+++ b/_docs/09-branching-model.md
@@ -0,0 +1,149 @@
+---
+title: "Branching Model"
+permalink: /docs/branching-model
+excerpt: "Apache RocketMQ Branching Model"
+modified: 2017-02-7T15:01:43-04:00
+---
+
+{% include toc %}
+
+A summary of RocketMQ branching model:
+
+
+
+
+# The main branches
+
+At the core, the development model is greatly inspired by existing models out there. The central repo holds two main branches with an infinite lifetime:
+
+* master
+* develop
+
+The **master** branch at origin should be familiar to every Git user. Parallel to the master branch, another branch exists called **develop**.
+
+We consider **origin/master** to be the main branch where the source code of HEAD always reflects a production-ready state.
+
+We consider **origin/develop** to be the main branch where the source code of HEAD always reflects a state with the latest delivered development changes for the next release. Some would call this the \u201cintegration branch\u201d. This is where any automatic nightly builds are built from.
+
+When the source code in the develop branch reaches a stable point and is ready to be released, all of the changes should be merged back into master somehow and then tagged with a release number. How this is done in detail will be discussed further on.
+
+Therefore, each time when changes are merged back into master, this is a new production release by definition. We tend to be very strict at this, so that theoretically, we could use a Git hook script to automatically build and roll-out our software to our production servers everytime there was a commit on **master**.
+
+
+
+
+# Supporting branches
+
+Next to the main branches master and develop, our development model uses a variety of supporting branches to aid parallel development between team members, ease tracking of features, prepare for production releases and to assist in quickly fixing live production problems. Unlike the main branches, these branches always have a limited life time, since they will be removed eventually.
+
+The different types of branches we may use are:
+
+* Feature branches
+* Release branches
+* Hotfix branches
+
+Each of these branches have a specific purpose and are bound to strict rules as to which branches may be their originating branch and which branches must be their merge targets. We will walk through them in a minute.
+
+By no means are these branches \u201cspecial\u201d from a technical perspective. The branch types are categorized by how we use them. They are of course plain old Git branches.
+
+## Feature branches
+
+May branch off from:
+> **develop**
+
+Must merge back into:
+> **develop**
+
+Branch naming convention:
+> anything except master, develop, release-\*, or hotfix-\*
+
+Feature branches (or sometimes called topic branches) are used to develop new features for the upcoming or a distant future release. When starting development of a feature, the target release in which this feature will be incorporated may well be unknown at that point. The essence of a feature branch is that it exists as long as the feature is in development, but will eventually be merged back into **develop** (to definitely add the new feature to the upcoming release) or discarded (in case of a disappointing experiment).
+
+Feature branches typically exist in developer repos only, not in **origin**.
+
+
+
+
+### Creating a feature branch
+
+When starting work on a new feature, branch off from the **develop** branch.
+
+```shell
+$ git checkout -b myfeature develop
+Switched to a new branch "myfeature"
+```
+### Incorporating a finished feature on develop
+
+Finished features may be merged into the **develop** branch to definitely add them to the upcoming release:
+
+```shell
+$ git checkout develop
+Switched to branch 'develop'
+$ git merge --no-ff myfeature
+Updating ea1b82a..05e9557
+(Summary of changes)
+$ git branch -d myfeature
+Deleted branch myfeature (was 05e9557).
+$ git push origin develop
+```
+
+The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward. This avoids losing information about the historical existence of a feature branch and groups together all commits that together added the feature. Compare:
+
+
+
+
+In the latter case, it is impossible to see from the Git history which of the commit objects together have implemented a feature\u2014you would have to manually read all the log messages. Reverting a whole feature (i.e. a group of commits), is a true headache in the latter situation, whereas it is easily done if the **--no-ff** flag was used.
+
+Yes, it will create a few more (empty) commit objects, but the gain is much bigger than the cost.
+
+## Release branches
+
+May branch off from:
+> **develop**
+
+Must merge back into:
+> **develop and master**
+
+Branch naming convention:
+> **release-***
+
+Release branches support preparation of a new production release. They allow for last-minute dotting of i\u2019s and crossing t\u2019s. Furthermore, they allow for minor bug fixes and preparing meta-data for a release (version number, build dates, etc.). By doing all of this work on a release branch, the **develop** branch is cleared to receive features for the next big release.
+
+The key moment to branch off a new release branch from **develop** is when develop (almost) reflects the desired state of the new release. At least all features that are targeted for the release-to-be-built must be merged in to develop at this point in time. All features targeted at future releases may not\u2014they must wait until after the release branch is branched off.
+
+It is exactly at the start of a release branch that the upcoming release gets assigned a version number\u2014not any earlier. Up until that moment, the develop branch reflected changes for the \u201cnext release\u201d, but it is unclear whether that \u201cnext release\u201d will eventually become 0.3 or 1.0, until the release branch is started. That decision is made on the start of the release branch and is carried out by the project\u2019s rules on version number bumping.
+
+### Creating a release branch
+
+Release branches are created from the develop branch:
+
+```shell
+$ git checkout -b release-4.0.0-incubating develop
+Switched to a new branch "release-4.0.0-incubating"
+```
+
+Please refer to [here](/docs/release-manual) for the following process.
+
+After the Apache release process is done, remember to merge back into **develop** and **master** branches.
+
+## Hotfix branches
+
+May branch off from:
+> **master**
+
+Must merge back into:
+> **develop and master**
+
+Branch naming convention:
+> **hotfix-\***
+
+Hotfix branches are very much like release branches in that they are also meant to prepare for a new production release, albeit unplanned. They arise from the necessity to act immediately upon an undesired state of a live production version. When a critical bug in a production version must be resolved immediately, a hotfix branch may be branched off from the corresponding tag on the master branch that marks the production version.
+
+The essence is that work of team members (on the develop branch) can continue, while another person is preparing a quick production fix.
+
+
+# References
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+
+
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/_posts/2017-01-24-release-notes-4.0.0-incubating.md
----------------------------------------------------------------------
diff --git a/_posts/2017-01-24-release-notes-4.0.0-incubating.md b/_posts/2017-01-24-release-notes-4.0.0-incubating.md
index 090904a..4a2bbf2 100644
--- a/_posts/2017-01-24-release-notes-4.0.0-incubating.md
+++ b/_posts/2017-01-24-release-notes-4.0.0-incubating.md
@@ -130,11 +130,6 @@ Below is a summary of the JIRA issues addressed in the 4.0.0-incubating release
</li>
<li>[<a href='https://issues.apache.org/jira/browse/ROCKETMQ-9'>ROCKETMQ-9</a>] - Errors in rocketmq-store module
</li>
-</ul>
-
-<h2> Task
-</h2>
-<ul>
<li>[<a href='https://issues.apache.org/jira/browse/ROCKETMQ-3'>ROCKETMQ-3</a>] - Clean up the unit test of rocketmq
</li>
<li>[<a href='https://issues.apache.org/jira/browse/ROCKETMQ-13'>ROCKETMQ-13</a>] - Wrong log level for
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/assets/images/release-manual/14864364524873.jpg
----------------------------------------------------------------------
diff --git a/assets/images/release-manual/14864364524873.jpg b/assets/images/release-manual/14864364524873.jpg
new file mode 100644
index 0000000..3b8ce4e
Binary files /dev/null and b/assets/images/release-manual/14864364524873.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/assets/images/release-manual/14864365609580.jpg
----------------------------------------------------------------------
diff --git a/assets/images/release-manual/14864365609580.jpg b/assets/images/release-manual/14864365609580.jpg
new file mode 100644
index 0000000..7c88571
Binary files /dev/null and b/assets/images/release-manual/14864365609580.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/assets/images/release-manual/14864367062507.jpg
----------------------------------------------------------------------
diff --git a/assets/images/release-manual/14864367062507.jpg b/assets/images/release-manual/14864367062507.jpg
new file mode 100644
index 0000000..df6d858
Binary files /dev/null and b/assets/images/release-manual/14864367062507.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/assets/images/release-manual/14864368514198.jpg
----------------------------------------------------------------------
diff --git a/assets/images/release-manual/14864368514198.jpg b/assets/images/release-manual/14864368514198.jpg
new file mode 100644
index 0000000..cb241eb
Binary files /dev/null and b/assets/images/release-manual/14864368514198.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/assets/images/release-manual/14864376551544.jpg
----------------------------------------------------------------------
diff --git a/assets/images/release-manual/14864376551544.jpg b/assets/images/release-manual/14864376551544.jpg
new file mode 100644
index 0000000..1792e8d
Binary files /dev/null and b/assets/images/release-manual/14864376551544.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/de7c1e27/home.md
----------------------------------------------------------------------
diff --git a/home.md b/home.md
index 0499618..344eabc 100644
--- a/home.md
+++ b/home.md
@@ -39,4 +39,7 @@ feature_row1:
{% include feature_row %}
-{% include feature_row id="feature_row1" %}
\ No newline at end of file
+{% include feature_row id="feature_row1" %}
+
+## Disclaimer
+Apache RocketMQ is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
\ No newline at end of file
[3/3] incubator-rocketmq-site git commit: Polish footer
Posted by yu...@apache.org.
Polish footer
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/commit/34dc0f2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/34dc0f2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/34dc0f2c
Branch: refs/heads/master
Commit: 34dc0f2c4035b84dea136acbd3747a4c67254769
Parents: de7c1e2
Author: yukon <yu...@apache.org>
Authored: Tue Feb 7 15:42:29 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Feb 7 15:42:29 2017 +0800
----------------------------------------------------------------------
_includes/footer.html | 54 +++++++++++++++++++++--------------
assets/images/feather-small.gif | Bin 0 -> 129292 bytes
2 files changed, 33 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/34dc0f2c/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
index d132cfa..ef9d174 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,22 +1,34 @@
-<div class="page__footer-follow">
- <ul class="social-icons">
- {% if site.data.ui-text[site.locale].follow_label %}
- <li><strong>{{ site.data.ui-text[site.locale].follow_label }}</strong></li>
- {% endif %}
- {% if site.twitter.username %}
- <li><a href="https://twitter.com/{{ site.twitter.username }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
- {% endif %}
- {% if site.facebook.username %}
- <li><a href="https://facebook.com/{{ site.facebook.username }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
- {% endif %}
- {% if site.author.github %}
- <li><a href="http://github.com/{{ site.author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
- {% endif %}
- {% if site.author.bitbucket %}
- <li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
- {% endif %}
- <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | absolute_url }}{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
- </ul>
-</div>
+<style type="text/css">
+ div.columns { float: left; margin-left: 10px;}
+ div.clear { clear: both; }
+</style>
+<div>
+ <div class="columns">
+ <a href="https://www.apache.org/"><img src="/assets/images/feather-small.gif" alt="Apache Software Foundation" style="height: 88px !important" /></a>
+ </div>
+ <div class="columns">
+ <div class="page__footer-follow">
+ <ul class="social-icons">
+ {% if site.data.ui-text[site.locale].follow_label %}
+ <li><strong>{{ site.data.ui-text[site.locale].follow_label }}</strong></li>
+ {% endif %}
+ {% if site.twitter.username %}
+ <li><a href="https://twitter.com/{{ site.twitter.username }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+ {% endif %}
+ {% if site.facebook.username %}
+ <li><a href="https://facebook.com/{{ site.facebook.username }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
+ {% endif %}
+ {% if site.author.github %}
+ <li><a href="http://github.com/{{ site.author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+ {% endif %}
+ {% if site.author.bitbucket %}
+ <li><a href="http://bitbucket.org/{{ site.author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
+ {% endif %}
+ <li><a href="{% if site.atom_feed.path %}{{ site.atom_feed.path }}{% else %}{{ '/feed.xml' | absolute_url }}{% endif %}"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].feed_label | default: "Feed" }}</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © {{ site.time | date: '%Y' }} <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
\ No newline at end of file
+ <div class="page__footer-copyright">Copyright © {{ site.time | date: '%Y' }} <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/34dc0f2c/assets/images/feather-small.gif
----------------------------------------------------------------------
diff --git a/assets/images/feather-small.gif b/assets/images/feather-small.gif
new file mode 100644
index 0000000..5a8a79b
Binary files /dev/null and b/assets/images/feather-small.gif differ