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:27 UTC
[6/6] incubator-rocketmq-site git commit: Release at 2017.2.17
Release at 2017.2.17
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/d61431e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/d61431e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/d61431e5
Branch: refs/heads/asf-site
Commit: d61431e569623db4c9e0ad1fb2025cbce3e0b698
Parents: 1e3086a
Author: yukon <yu...@apache.org>
Authored: Tue Feb 7 15:47:03 2017 +0800
Committer: yukon <yu...@apache.org>
Committed: Tue Feb 7 15:47:03 2017 +0800
----------------------------------------------------------------------
content/404.html | 46 +-
content/DISCLAIMER | 1 +
content/NOTICE | 5 +
content/about/contact/index.html | 50 +-
content/about/index.html | 46 +-
content/about/rewards/index.html | 50 +-
content/about/team/index.html | 50 +-
.../launch-rocketmq-code-marathon/index.html | 46 +-
content/archive-layout-with-content/index.html | 74 +-
content/assets/images/feather-small.gif | Bin 0 -> 129292 bytes
.../images/release-manual/14864364524873.jpg | Bin 0 -> 347275 bytes
.../images/release-manual/14864365609580.jpg | Bin 0 -> 84289 bytes
.../images/release-manual/14864367062507.jpg | Bin 0 -> 45304 bytes
.../images/release-manual/14864368514198.jpg | Bin 0 -> 87040 bytes
.../images/release-manual/14864376551544.jpg | Bin 0 -> 103860 bytes
content/categories/index.html | 46 +-
content/collection-archive/index.html | 88 +-
content/community/index.html | 46 +-
content/docs/best-practice-broker/index.html | 98 ++-
content/docs/best-practice-consumer/index.html | 96 +-
content/docs/best-practice-namesvr/index.html | 96 +-
content/docs/best-practice-producer/index.html | 96 +-
content/docs/branching-model.html | 693 +++++++++++++++
content/docs/cli-admin-tool/index.html | 96 +-
content/docs/cluster-deployment/index.html | 96 +-
content/docs/code-guidelines/index.html | 96 +-
content/docs/core-concept/index.html | 96 +-
content/docs/faq/index.html | 98 ++-
content/docs/motivation/index.html | 96 +-
content/docs/pull-request/index.html | 96 +-
content/docs/quick-start/index.html | 96 +-
content/docs/release-manual.html | 869 +++++++++++++++++++
content/feed.xml | 7 +-
content/index.html | 49 +-
.../index.html | 46 +-
.../release-notes-4.0.0-incubating/index.html | 51 +-
.../index.html | 46 +-
content/sitemap.xml | 12 +
content/tags/index.html | 46 +-
content/year-archive/index.html | 46 +-
40 files changed, 3038 insertions(+), 531 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/404.html
----------------------------------------------------------------------
diff --git a/content/404.html b/content/404.html
index b92b325..8c9053f 100644
--- a/content/404.html
+++ b/content/404.html
@@ -331,24 +331,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/DISCLAIMER
----------------------------------------------------------------------
diff --git a/content/DISCLAIMER b/content/DISCLAIMER
new file mode 100644
index 0000000..cf4d044
--- /dev/null
+++ b/content/DISCLAIMER
@@ -0,0 +1 @@
+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.
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/NOTICE
----------------------------------------------------------------------
diff --git a/content/NOTICE b/content/NOTICE
new file mode 100644
index 0000000..5384857
--- /dev/null
+++ b/content/NOTICE
@@ -0,0 +1,5 @@
+Apache RocketMQ (incubating)
+Copyright 2016-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/about/contact/index.html
----------------------------------------------------------------------
diff --git a/content/about/contact/index.html b/content/about/contact/index.html
index 4cfbe2e..16ede4a 100644
--- a/content/about/contact/index.html
+++ b/content/about/contact/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -206,7 +206,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="CONTACT">
<meta itemprop="description" content="Contact.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 29, 2016">
<div class="page__inner-wrap">
@@ -322,24 +322,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/about/index.html
----------------------------------------------------------------------
diff --git a/content/about/index.html b/content/about/index.html
index 7b3feb3..416bd08 100644
--- a/content/about/index.html
+++ b/content/about/index.html
@@ -324,24 +324,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/about/rewards/index.html
----------------------------------------------------------------------
diff --git a/content/about/rewards/index.html b/content/about/rewards/index.html
index 05741d8..8c23935 100644
--- a/content/about/rewards/index.html
+++ b/content/about/rewards/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -206,7 +206,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="REWARDS">
<meta itemprop="description" content="Rewards.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="January 25, 2017">
<div class="page__inner-wrap">
@@ -278,24 +278,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/about/team/index.html
----------------------------------------------------------------------
diff --git a/content/about/team/index.html b/content/about/team/index.html
index 46cee77..fde85ed 100644
--- a/content/about/team/index.html
+++ b/content/about/team/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -206,7 +206,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="TEAM">
<meta itemprop="description" content="Project team.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 29, 2016">
<div class="page__inner-wrap">
@@ -392,24 +392,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/activity/launch-rocketmq-code-marathon/index.html
----------------------------------------------------------------------
diff --git a/content/activity/launch-rocketmq-code-marathon/index.html b/content/activity/launch-rocketmq-code-marathon/index.html
index 9c0dff8..d5ab53d 100644
--- a/content/activity/launch-rocketmq-code-marathon/index.html
+++ b/content/activity/launch-rocketmq-code-marathon/index.html
@@ -458,24 +458,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/archive-layout-with-content/index.html
----------------------------------------------------------------------
diff --git a/content/archive-layout-with-content/index.html b/content/archive-layout-with-content/index.html
index 6aeccea..f1be789 100644
--- a/content/archive-layout-with-content/index.html
+++ b/content/archive-layout-with-content/index.html
@@ -711,6 +711,34 @@
<h2 class="archive__item-title" itemprop="headline">
+ <a href="/docs/release-manual" rel="permalink">Release Manual</a>
+
+ </h2>
+
+ <p class="archive__item-excerpt" itemprop="description">Apache RocketMQ Release Manual
+</p>
+ </article>
+</div>
+
+<div class="list__item">
+ <article class="archive__item" itemscope="" itemtype="http://schema.org/CreativeWork">
+
+ <h2 class="archive__item-title" itemprop="headline">
+
+ <a href="/docs/branching-model" rel="permalink">Branching Model</a>
+
+ </h2>
+
+ <p class="archive__item-excerpt" itemprop="description">Apache RocketMQ Branching Model
+</p>
+ </article>
+</div>
+
+<div class="list__item">
+ <article class="archive__item" itemscope="" itemtype="http://schema.org/CreativeWork">
+
+ <h2 class="archive__item-title" itemprop="headline">
+
<a href="/404.html" rel="permalink">Page Not Found</a>
</h2>
@@ -926,24 +954,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/assets/images/feather-small.gif
----------------------------------------------------------------------
diff --git a/content/assets/images/feather-small.gif b/content/assets/images/feather-small.gif
new file mode 100644
index 0000000..5a8a79b
Binary files /dev/null and b/content/assets/images/feather-small.gif differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/assets/images/release-manual/14864364524873.jpg
----------------------------------------------------------------------
diff --git a/content/assets/images/release-manual/14864364524873.jpg b/content/assets/images/release-manual/14864364524873.jpg
new file mode 100644
index 0000000..3b8ce4e
Binary files /dev/null and b/content/assets/images/release-manual/14864364524873.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/assets/images/release-manual/14864365609580.jpg
----------------------------------------------------------------------
diff --git a/content/assets/images/release-manual/14864365609580.jpg b/content/assets/images/release-manual/14864365609580.jpg
new file mode 100644
index 0000000..7c88571
Binary files /dev/null and b/content/assets/images/release-manual/14864365609580.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/assets/images/release-manual/14864367062507.jpg
----------------------------------------------------------------------
diff --git a/content/assets/images/release-manual/14864367062507.jpg b/content/assets/images/release-manual/14864367062507.jpg
new file mode 100644
index 0000000..df6d858
Binary files /dev/null and b/content/assets/images/release-manual/14864367062507.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/assets/images/release-manual/14864368514198.jpg
----------------------------------------------------------------------
diff --git a/content/assets/images/release-manual/14864368514198.jpg b/content/assets/images/release-manual/14864368514198.jpg
new file mode 100644
index 0000000..cb241eb
Binary files /dev/null and b/content/assets/images/release-manual/14864368514198.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/assets/images/release-manual/14864376551544.jpg
----------------------------------------------------------------------
diff --git a/content/assets/images/release-manual/14864376551544.jpg b/content/assets/images/release-manual/14864376551544.jpg
new file mode 100644
index 0000000..1792e8d
Binary files /dev/null and b/content/assets/images/release-manual/14864376551544.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/categories/index.html
----------------------------------------------------------------------
diff --git a/content/categories/index.html b/content/categories/index.html
index 91ae532..78cc757 100644
--- a/content/categories/index.html
+++ b/content/categories/index.html
@@ -511,24 +511,36 @@ January 5th 2017
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/collection-archive/index.html
----------------------------------------------------------------------
diff --git a/content/collection-archive/index.html b/content/collection-archive/index.html
index f36034e..dc4936a 100644
--- a/content/collection-archive/index.html
+++ b/content/collection-archive/index.html
@@ -541,6 +541,48 @@
<h2 class="archive__item-title" itemprop="headline">
+ <a href="/docs/release-manual" rel="permalink">Release Manual
+</a>
+
+ </h2>
+
+ <p class="archive__item-excerpt" itemprop="description">Apache RocketMQ Release Manual
+</p>
+ </article>
+</div>
+
+
+
+
+
+
+
+<div class="list__item">
+ <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">
+
+ <h2 class="archive__item-title" itemprop="headline">
+
+ <a href="/docs/branching-model" rel="permalink">Branching Model
+</a>
+
+ </h2>
+
+ <p class="archive__item-excerpt" itemprop="description">Apache RocketMQ Branching Model
+</p>
+ </article>
+</div>
+
+
+
+
+
+
+
+<div class="list__item">
+ <article class="archive__item" itemscope itemtype="http://schema.org/CreativeWork">
+
+ <h2 class="archive__item-title" itemprop="headline">
+
<a href="/docs/best-practice-broker/" rel="permalink">Best Practice For Broker
</a>
@@ -666,24 +708,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/community/index.html
----------------------------------------------------------------------
diff --git a/content/community/index.html b/content/community/index.html
index 5b0e34f..e1634ff 100644
--- a/content/community/index.html
+++ b/content/community/index.html
@@ -426,24 +426,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/best-practice-broker/index.html
----------------------------------------------------------------------
diff --git a/content/docs/best-practice-broker/index.html b/content/docs/best-practice-broker/index.html
index 9fb762b..a1a1eb5 100644
--- a/content/docs/best-practice-broker/index.html
+++ b/content/docs/best-practice-broker/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="Best Practice For Broker">
<meta itemprop="description" content="Some useful tips for users.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 25, 2016">
<div class="page__inner-wrap">
@@ -380,7 +424,7 @@ If you just want to make it easy, you may only need a ASYNC_MASTER without SLAVE
<nav class="pagination">
- <a href="/docs/faq/" class="pagination--pager" title="Frequently Asked Questions
+ <a href="/docs/branching-model" class="pagination--pager" title="Branching Model
">Previous</a>
@@ -411,24 +455,36 @@ If you just want to make it easy, you may only need a ASYNC_MASTER without SLAVE
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/best-practice-consumer/index.html
----------------------------------------------------------------------
diff --git a/content/docs/best-practice-consumer/index.html b/content/docs/best-practice-consumer/index.html
index d6f6d80..beb63d5 100644
--- a/content/docs/best-practice-consumer/index.html
+++ b/content/docs/best-practice-consumer/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="Best Practice For Consumer">
<meta itemprop="description" content="Some useful tips for users.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 25, 2016">
<div class="page__inner-wrap">
@@ -436,24 +480,36 @@ You can also use CONSUME_FROM_TIMESTAMP to consume messages produced after the s
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/best-practice-namesvr/index.html
----------------------------------------------------------------------
diff --git a/content/docs/best-practice-namesvr/index.html b/content/docs/best-practice-namesvr/index.html
index aca436a..a6c8fc0 100644
--- a/content/docs/best-practice-namesvr/index.html
+++ b/content/docs/best-practice-namesvr/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="Best Practice For NameServer">
<meta itemprop="description" content="Some useful tips for users.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 25, 2016">
<div class="page__inner-wrap">
@@ -399,24 +443,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/best-practice-producer/index.html
----------------------------------------------------------------------
diff --git a/content/docs/best-practice-producer/index.html b/content/docs/best-practice-producer/index.html
index a8911b1..860a7c2 100644
--- a/content/docs/best-practice-producer/index.html
+++ b/content/docs/best-practice-producer/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="Best Practice For Producer">
<meta itemprop="description" content="Some useful tips for users.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 25, 2016">
<div class="page__inner-wrap">
@@ -444,24 +488,36 @@ In default, you can only create only one producer with the same producer group i
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/branching-model.html
----------------------------------------------------------------------
diff --git a/content/docs/branching-model.html b/content/docs/branching-model.html
new file mode 100644
index 0000000..a3c18ee
--- /dev/null
+++ b/content/docs/branching-model.html
@@ -0,0 +1,693 @@
+<!doctype html>
+<html lang="en" class="no-js">
+ <head>
+ <meta charset="utf-8">
+
+<!-- begin SEO -->
+
+
+
+
+
+
+
+
+
+<title>Branching Model - Apache RocketMQ</title>
+
+
+
+
+<meta name="description" content="Apache RocketMQ Branching Model">
+
+
+
+
+<meta property="og:locale" content="en">
+<meta property="og:site_name" content="Apache RocketMQ">
+<meta property="og:title" content="Branching Model">
+
+
+
+
+ <meta property="og:description" content="Apache RocketMQ Branching Model">
+
+
+
+ <meta name="twitter:site" content="@ApacheRocketMQ">
+ <meta name="twitter:title" content="Branching Model">
+ <meta name="twitter:description" content="Apache RocketMQ Branching Model">
+ <meta name="twitter:url" content="">
+
+
+ <meta name="twitter:card" content="summary">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <meta property="og:type" content="article">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
+
+
+
+
+
+
+
+
+ <script type="application/ld+json">
+ {
+ "@context" : "http://schema.org",
+ "@type" : "Person",
+ "name" : "Apache RocketMQ",
+ "url" : null,
+ "sameAs" : null
+ }
+ </script>
+
+
+
+ <meta name="google-site-verification" content="aand0XZkSGsziuC-UPD4ZJniFD0m0JhGx6820y2mAQY" />
+
+
+
+
+<!-- end SEO -->
+
+
+<link href="/feed.xml" type="application/atom+xml" rel="alternate" title="Apache RocketMQ Feed">
+
+<!-- http://t.co/dKP3o1e -->
+<meta name="HandheldFriendly" content="True">
+<meta name="MobileOptimized" content="320">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+<script>
+ document.documentElement.className = document.documentElement.className.replace(/\bno-js\b/g, '') + ' js ';
+</script>
+
+<!-- For all browsers -->
+<link rel="stylesheet" href="/assets/css/main.css">
+
+<meta http-equiv="cleartype" content="on">
+ <!-- start custom head snippets -->
+
+<!-- insert favicons. use http://realfavicongenerator.net/ -->
+
+<!-- end custom head snippets -->
+ </head>
+
+ <body class="layout--single">
+
+ <!--[if lt IE 9]>
+<div class="notice--danger align-center" style="margin: 0;">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</div>
+<![endif]-->
+ <div class="masthead">
+ <div class="masthead__inner-wrap">
+ <div class="masthead__menu">
+ <nav id="site-nav" class="greedy-nav">
+ <button><div class="navicon"></div></button>
+ <ul class="visible-links">
+ <li class="masthead__menu-item masthead__menu-item--lg"><a href="/">Apache RocketMQ</a></li>
+
+
+ <li class="masthead__menu-item"><a href="/docs/quick-start/">Documentation</a></li>
+
+
+ <li class="masthead__menu-item"><a href="/year-archive/">Blog</a></li>
+
+
+ <li class="masthead__menu-item"><a href="/community/">Community</a></li>
+
+
+ <li class="masthead__menu-item"><a href="/about/team/">About</a></li>
+
+ </ul>
+ <ul class="hidden-links hidden"></ul>
+ </nav>
+ </div>
+ </div>
+</div>
+
+
+
+
+
+<div id="main" role="main">
+
+ <div class="sidebar sticky">
+
+
+
+
+
+
+
+
+
+
+<nav class="nav__list">
+
+ <input id="ac-toc" name="accordion-toc" type="checkbox" />
+ <label for="ac-toc">Toggle Menu</label>
+ <ul class="nav__items">
+
+ <li>
+
+ <span class="nav__sub-title">User Guide</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="/docs/quick-start/" class="">Quick Start</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/motivation/" class="">Motivation</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/core-concept/" class="">Core Concept</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/cli-admin-tool/" class="">CLI Admin Tool</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/cluster-deployment/" class="">Cluster Configuration & Deployment</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
+ <span class="nav__sub-title">Developer Guide</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="/docs/code-guidelines/" class="">Code Guidelines</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/branching-model" class="active">Branching Model</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
+ <span class="nav__sub-title">Best Practice</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="/docs/best-practice-broker/" class="">Broker</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/best-practice-producer/" class="">Producer</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/best-practice-consumer/" class="">Consumer</a></li>
+
+
+
+
+
+
+
+ <li><a href="/docs/best-practice-namesvr/" class="">NameServer</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
+
+
+
+ <a href="/docs/faq/"><span class="nav__sub-title">FAQ</span></a>
+
+
+
+ </li>
+
+ </ul>
+</nav>
+
+
+ </div>
+
+
+ <article class="page" itemscope itemtype="http://schema.org/CreativeWork">
+ <meta itemprop="headline" content="Branching Model">
+ <meta itemprop="description" content="Apache RocketMQ Branching Model">
+ <meta itemprop="datePublished" content="February 07, 2017">
+ <meta itemprop="dateModified" content="February 08, 2017">
+
+ <div class="page__inner-wrap">
+
+ <header>
+ <h1 class="page__title" itemprop="headline">Branching Model
+</h1>
+
+ </header>
+
+
+ <section class="page__content" itemprop="text">
+ <aside class="sidebar__right">
+<nav class="toc">
+ <header><h4 class="nav__title"><i class="fa fa-file-text"></i> On This Page</h4></header>
+<ul class="toc__menu" id="markdown-toc">
+ <li><a href="#the-main-branches" id="markdown-toc-the-main-branches">The main branches</a></li>
+ <li><a href="#supporting-branches" id="markdown-toc-supporting-branches">Supporting branches</a> <ul>
+ <li><a href="#feature-branches" id="markdown-toc-feature-branches">Feature branches</a> <ul>
+ <li><a href="#creating-a-feature-branch" id="markdown-toc-creating-a-feature-branch">Creating a feature branch</a></li>
+ <li><a href="#incorporating-a-finished-feature-on-develop" id="markdown-toc-incorporating-a-finished-feature-on-develop">Incorporating a finished feature on develop</a></li>
+ </ul>
+ </li>
+ <li><a href="#release-branches" id="markdown-toc-release-branches">Release branches</a> <ul>
+ <li><a href="#creating-a-release-branch" id="markdown-toc-creating-a-release-branch">Creating a release branch</a></li>
+ </ul>
+ </li>
+ <li><a href="#hotfix-branches" id="markdown-toc-hotfix-branches">Hotfix branches</a></li>
+ </ul>
+ </li>
+ <li><a href="#references" id="markdown-toc-references">References</a></li>
+</ul>
+
+ </nav>
+</aside>
+
+<p>A summary of RocketMQ branching model:</p>
+
+<p><img src="/assets/images/release-manual/14864364524873.jpg" alt="" /></p>
+
+<h1 id="the-main-branches">The main branches</h1>
+
+<p>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:</p>
+
+<ul>
+ <li>master</li>
+ <li>develop</li>
+</ul>
+
+<p>The <strong>master</strong> branch at origin should be familiar to every Git user. Parallel to the master branch, another branch exists called <strong>develop</strong>.</p>
+
+<p>We consider <strong>origin/master</strong> to be the main branch where the source code of HEAD always reflects a production-ready state.</p>
+
+<p>We consider <strong>origin/develop</strong> 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.</p>
+
+<p>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.</p>
+
+<p>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 <strong>master</strong>.</p>
+
+<p><img src="/assets/images/release-manual/14864365609580.jpg" alt="" /></p>
+
+<h1 id="supporting-branches">Supporting branches</h1>
+
+<p>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.</p>
+
+<p>The different types of branches we may use are:</p>
+
+<ul>
+ <li>Feature branches</li>
+ <li>Release branches</li>
+ <li>Hotfix branches</li>
+</ul>
+
+<p>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.</p>
+
+<p>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.</p>
+
+<h2 id="feature-branches">Feature branches</h2>
+
+<p>May branch off from:</p>
+<blockquote>
+ <p><strong>develop</strong></p>
+</blockquote>
+
+<p>Must merge back into:</p>
+<blockquote>
+ <p><strong>develop</strong></p>
+</blockquote>
+
+<p>Branch naming convention:</p>
+<blockquote>
+ <p>anything except master, develop, release-*, or hotfix-*</p>
+</blockquote>
+
+<p>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 <strong>develop</strong> (to definitely add the new feature to the upcoming release) or discarded (in case of a disappointing experiment).</p>
+
+<p>Feature branches typically exist in developer repos only, not in <strong>origin</strong>.</p>
+
+<p><img src="/assets/images/release-manual/14864367062507.jpg" alt="" /></p>
+
+<h3 id="creating-a-feature-branch">Creating a feature branch</h3>
+
+<p>When starting work on a new feature, branch off from the <strong>develop</strong> branch.</p>
+
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git checkout -b myfeature develop
+Switched to a new branch <span class="s2">"myfeature"</span>
+</code></pre>
+</div>
+<h3 id="incorporating-a-finished-feature-on-develop">Incorporating a finished feature on develop</h3>
+
+<p>Finished features may be merged into the <strong>develop</strong> branch to definitely add them to the upcoming release:</p>
+
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git checkout develop
+Switched to branch <span class="s1">'develop'</span>
+<span class="gp">$ </span>git merge --no-ff myfeature
+Updating ea1b82a..05e9557
+<span class="o">(</span>Summary of changes<span class="o">)</span>
+<span class="gp">$ </span>git branch -d myfeature
+Deleted branch myfeature <span class="o">(</span>was 05e9557<span class="o">)</span>.
+<span class="gp">$ </span>git push origin develop
+</code></pre>
+</div>
+
+<p>The \u2013no-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:</p>
+
+<p><img src="/assets/images/release-manual/14864368514198.jpg" alt="" /></p>
+
+<p>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 <strong>\u2013no-ff</strong> flag was used.</p>
+
+<p>Yes, it will create a few more (empty) commit objects, but the gain is much bigger than the cost.</p>
+
+<h2 id="release-branches">Release branches</h2>
+
+<p>May branch off from:</p>
+<blockquote>
+ <p><strong>develop</strong></p>
+</blockquote>
+
+<p>Must merge back into:</p>
+<blockquote>
+ <p><strong>develop and master</strong></p>
+</blockquote>
+
+<p>Branch naming convention:</p>
+<blockquote>
+ <p><strong>release-</strong>*</p>
+</blockquote>
+
+<p>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 <strong>develop</strong> branch is cleared to receive features for the next big release.</p>
+
+<p>The key moment to branch off a new release branch from <strong>develop</strong> 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.</p>
+
+<p>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.</p>
+
+<h3 id="creating-a-release-branch">Creating a release branch</h3>
+
+<p>Release branches are created from the develop branch:</p>
+
+<div class="language-shell highlighter-rouge"><pre class="highlight"><code><span class="gp">$ </span>git checkout -b release-4.0.0-incubating develop
+Switched to a new branch <span class="s2">"release-4.0.0-incubating"</span>
+</code></pre>
+</div>
+
+<p>Please refer to <a href="/docs/release-manual">here</a> for the following process.</p>
+
+<p>After the Apache release process is done, remember to merge back into <strong>develop</strong> and <strong>master</strong> branches.</p>
+
+<h2 id="hotfix-branches">Hotfix branches</h2>
+
+<p>May branch off from:</p>
+<blockquote>
+ <p><strong>master</strong></p>
+</blockquote>
+
+<p>Must merge back into:</p>
+<blockquote>
+ <p><strong>develop and master</strong></p>
+</blockquote>
+
+<p>Branch naming convention:</p>
+<blockquote>
+ <p><strong>hotfix-*</strong></p>
+</blockquote>
+
+<p>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.</p>
+
+<p>The essence is that work of team members (on the develop branch) can continue, while another person is preparing a quick production fix.
+<img src="/assets/images/release-manual/14864376551544.jpg" alt="" /></p>
+
+<h1 id="references">References</h1>
+
+<p>[1] http://nvie.com/posts/a-successful-git-branching-model/</p>
+
+
+
+ </section>
+
+ <footer class="page__meta">
+
+
+
+
+
+ <p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> Updated:</strong> <time datetime="2017-02-08">February 08, 2017</time></p>
+
+ </footer>
+
+ <section class="page__share">
+
+ <h4 class="page__share-title">Share on</h4>
+
+
+ <a href="https://twitter.com/intent/tweet?via=ApacheRocketMQ&text=Branching Model /docs/branching-model" class="btn btn--twitter" title="Share on Twitter"><i class="fa fa-fw fa-twitter" aria-hidden="true"></i><span> Twitter</span></a>
+
+ <a href="https://www.facebook.com/sharer/sharer.php?u=/docs/branching-model" class="btn btn--facebook" title="Share on Facebook"><i class="fa fa-fw fa-facebook" aria-hidden="true"></i><span> Facebook</span></a>
+
+ <a href="https://plus.google.com/share?url=/docs/branching-model" class="btn btn--google-plus" title="Share on Google Plus"><i class="fa fa-fw fa-google-plus" aria-hidden="true"></i><span> Google+</span></a>
+
+ <a href="https://www.linkedin.com/shareArticle?mini=true&url=/docs/branching-model" class="btn btn--linkedin" title="Share on LinkedIn"><i class="fa fa-fw fa-linkedin" aria-hidden="true"></i><span> LinkedIn</span></a>
+</section>
+
+
+
+ <nav class="pagination">
+
+ <a href="/docs/release-manual" class="pagination--pager" title="Release Manual
+">Previous</a>
+
+
+ <a href="/docs/best-practice-broker/" class="pagination--pager" title="Best Practice For Broker
+">Next</a>
+
+ </nav>
+
+ </div>
+
+
+ <div class="page__comments">
+
+
+ <h4 class="page__comments-title">Leave a Comment</h4>
+ <section id="disqus_thread"></section>
+
+</div>
+
+ </article>
+
+
+
+</div>
+
+ <div class="page__footer">
+ <footer>
+ <!-- start custom footer snippets -->
+
+<!-- end custom footer snippets -->
+ <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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
+
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
+ </footer>
+ </div>
+
+ <script src="/assets/js/main.min.js"></script>
+
+
+
+
+ <script>
+ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+ m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+ })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+ ga('create', 'UA-89603173-1', 'auto');
+ ga('send', 'pageview');
+</script>
+
+
+
+
+
+
+
+ <script type="text/javascript">
+ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+ var disqus_shortname = 'rocketmq';
+
+ /* * * DON'T EDIT BELOW THIS LINE * * */
+ (function() {
+ var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ })();
+
+ /* * * DON'T EDIT BELOW THIS LINE * * */
+ (function () {
+ var s = document.createElement('script'); s.async = true;
+ s.type = 'text/javascript';
+ s.src = '//' + disqus_shortname + '.disqus.com/count.js';
+ (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+ }());
+ </script>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+
+
+
+
+
+
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/cli-admin-tool/index.html
----------------------------------------------------------------------
diff --git a/content/docs/cli-admin-tool/index.html b/content/docs/cli-admin-tool/index.html
index cf4ae38..c1e218d 100644
--- a/content/docs/cli-admin-tool/index.html
+++ b/content/docs/cli-admin-tool/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="CLI Admin Tool">
<meta itemprop="description" content="RocketMQ provides a CLI admin tool belt to query, manage and diagnose various issues.">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 17, 2016">
<div class="page__inner-wrap">
@@ -472,24 +516,36 @@ See 'mqadmin help <command>' for more information on a specific command.
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/cluster-deployment/index.html
----------------------------------------------------------------------
diff --git a/content/docs/cluster-deployment/index.html b/content/docs/cluster-deployment/index.html
index fe15e7b..94190be 100644
--- a/content/docs/cluster-deployment/index.html
+++ b/content/docs/cluster-deployment/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="Cluster Configuration and Deployment">
<meta itemprop="description" content="Prerequisite">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 17, 2016">
<div class="page__inner-wrap">
@@ -476,24 +520,36 @@ Assuming binary RocketMQ is at <code class="highlighter-rouge">/home/rocketmq/di
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/d61431e5/content/docs/code-guidelines/index.html
----------------------------------------------------------------------
diff --git a/content/docs/code-guidelines/index.html b/content/docs/code-guidelines/index.html
index d83f701..7c2beb1 100644
--- a/content/docs/code-guidelines/index.html
+++ b/content/docs/code-guidelines/index.html
@@ -57,7 +57,7 @@
<meta property="og:type" content="article">
- <meta property="article:published_time" content="2017-01-24T14:02:37+08:00">
+ <meta property="article:published_time" content="2017-02-07T15:46:03+08:00">
@@ -217,7 +217,7 @@
<li>
- <span class="nav__sub-title">Contributor Guide</span>
+ <span class="nav__sub-title">Developer Guide</span>
@@ -237,8 +237,24 @@
+ <li><a href="/docs/branching-model" class="">Branching Model</a></li>
+
+
+
+
+
+
+
<li><a href="/docs/pull-request/" class="">Best Practice in PR</a></li>
+
+
+
+
+
+
+ <li><a href="/docs/release-manual" class="">Release Manual</a></li>
+
</ul>
</li>
@@ -289,6 +305,34 @@
<li>
+ <span class="nav__sub-title">Release Notes</span>
+
+
+
+ <ul>
+
+
+
+
+
+
+
+ <li><a href="" class="">Download</a></li>
+
+
+
+
+
+
+
+ <li><a href="/release_notes/release-notes-4.0.0-incubating/" class="">4.0.0-incubating</a></li>
+
+ </ul>
+
+ </li>
+
+ <li>
+
@@ -308,7 +352,7 @@
<article class="page" itemscope itemtype="http://schema.org/CreativeWork">
<meta itemprop="headline" content="Coding Guidelines">
<meta itemprop="description" content="Apache RocketMQ Coding Guidelines">
- <meta itemprop="datePublished" content="January 24, 2017">
+ <meta itemprop="datePublished" content="February 07, 2017">
<meta itemprop="dateModified" content="December 30, 2016">
<div class="page__inner-wrap">
@@ -421,24 +465,36 @@
<!-- start custom footer snippets -->
<!-- end custom footer snippets -->
- <div class="page__footer-follow">
- <ul class="social-icons">
-
- <li><strong>Follow:</strong></li>
-
-
- <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
-
-
-
- <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
-
-
- <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> 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">
+
+ <li><strong>Follow:</strong></li>
+
+
+ <li><a href="https://twitter.com/ApacheRocketMQ"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
+
+
+
+ <li><a href="http://github.com/apache/incubator-rocketmq"><i class="fa fa-fw fa-github" aria-hidden="true"></i> GitHub</a></li>
+
+
+ <li><a href="/feed.xml"><i class="fa fa-fw fa-rss-square" aria-hidden="true"></i> Feed</a></li>
+ </ul>
+ </div>
-<div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ <div class="page__footer-copyright">Copyright © 2017 <a href="http://www.apache.org/">The Apache Software Foundation</a>. All Rights Reserved.</div>
+ </div>
+</div>
+<div class="clear"></div>
</footer>
</div>