Build

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/6f985233
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/tree/6f985233
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/diff/6f985233

Branch: refs/heads/asf-site
Commit: 6f985233bcdeb0c2e1fa124f98f7db41860798ce
Parents: b8375f7
Author: dongeforever <dongefore...@apache.org>
Authored: Thu Jun 8 17:12:18 2017 +0800
Committer: dongeforever <dongefore...@apache.org>
Committed: Thu Jun 8 17:12:18 2017 +0800

----------------------------------------------------------------------
 content/about/contact/index.html                |   6 +-
 content/about/rewards/index.html                |   6 +-
 content/about/team/index.html                   |   6 +-
 content/docs/batch-example/index.html           |   6 +-
 content/docs/best-practice-broker/index.html    |   6 +-
 content/docs/best-practice-consumer/index.html  |   6 +-
 content/docs/best-practice-namesvr/index.html   |   6 +-
 content/docs/best-practice-producer/index.html  |   6 +-
 content/docs/broadcast-example/index.html       |   6 +-
 content/docs/cli-admin-tool/index.html          |   6 +-
 content/docs/cluster-deployment/index.html      |   6 +-
 content/docs/code-guidelines/index.html         |   6 +-
 content/docs/core-concept/index.html            |   6 +-
 content/docs/create-pull-request/index.html     |   6 +-
 content/docs/documentation/index.html           |   6 +-
 content/docs/faq/index.html                     |   6 +-
 content/docs/filter-by-sql92-example/index.html |   6 +-
 content/docs/motivation/index.html              |   6 +-
 content/docs/order-example/index.html           |   6 +-
 content/docs/pull-request/index.html            |   6 +-
 content/docs/quick-start/index.html             |   6 +-
 content/docs/release-manual.html                |   6 +-
 content/docs/rmq-arc/index.html                 |   6 +-
 content/docs/rmq-deployment/index.html          |   6 +-
 content/docs/roadmap/index.html                 |   6 +-
 content/docs/schedule-example/index.html        |   6 +-
 content/docs/simple-example/index.html          |   6 +-
 content/dowloading/releases/index.html          |   6 +-
 content/feed.xml                                |   6 +-
 content/sitemap.xml                             | 117 -------------------
 30 files changed, 29 insertions(+), 262 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/about/contact/index.html
----------------------------------------------------------------------
diff --git a/content/about/contact/index.html b/content/about/contact/index.html
index a982517..0e45258 100644
--- a/content/about/contact/index.html
+++ b/content/about/contact/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/about/rewards/index.html
----------------------------------------------------------------------
diff --git a/content/about/rewards/index.html b/content/about/rewards/index.html
index 2663f4c..40fd43d 100644
--- a/content/about/rewards/index.html
+++ b/content/about/rewards/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/about/team/index.html
----------------------------------------------------------------------
diff --git a/content/about/team/index.html b/content/about/team/index.html
index 2f900b0..224f012 100644
--- a/content/about/team/index.html
+++ b/content/about/team/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/batch-example/index.html
----------------------------------------------------------------------
diff --git a/content/docs/batch-example/index.html 
b/content/docs/batch-example/index.html
index a73fe8f..f9e40ef 100644
--- a/content/docs/batch-example/index.html
+++ b/content/docs/batch-example/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/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 0412dbe..61604fd 100644
--- a/content/docs/best-practice-broker/index.html
+++ b/content/docs/best-practice-broker/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/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 2e4287c..b09d92a 100644
--- a/content/docs/best-practice-consumer/index.html
+++ b/content/docs/best-practice-consumer/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/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 a3e702f..e3a059b 100644
--- a/content/docs/best-practice-namesvr/index.html
+++ b/content/docs/best-practice-namesvr/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/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 1d5da39..26eceb1 100644
--- a/content/docs/best-practice-producer/index.html
+++ b/content/docs/best-practice-producer/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/broadcast-example/index.html
----------------------------------------------------------------------
diff --git a/content/docs/broadcast-example/index.html 
b/content/docs/broadcast-example/index.html
index 8698966..34638b9 100644
--- a/content/docs/broadcast-example/index.html
+++ b/content/docs/broadcast-example/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/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 15e1255..f7bdf09 100644
--- a/content/docs/cli-admin-tool/index.html
+++ b/content/docs/cli-admin-tool/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/cluster-deployment/index.html
----------------------------------------------------------------------
diff --git a/content/docs/cluster-deployment/index.html 
b/content/docs/cluster-deployment/index.html
index 6149998..a8a8145 100644
--- a/content/docs/cluster-deployment/index.html
+++ b/content/docs/cluster-deployment/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/code-guidelines/index.html
----------------------------------------------------------------------
diff --git a/content/docs/code-guidelines/index.html 
b/content/docs/code-guidelines/index.html
index 56f00b5..91c2436 100644
--- a/content/docs/code-guidelines/index.html
+++ b/content/docs/code-guidelines/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/core-concept/index.html
----------------------------------------------------------------------
diff --git a/content/docs/core-concept/index.html 
b/content/docs/core-concept/index.html
index 5ba13f5..ba0b9da 100644
--- a/content/docs/core-concept/index.html
+++ b/content/docs/core-concept/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/create-pull-request/index.html
----------------------------------------------------------------------
diff --git a/content/docs/create-pull-request/index.html 
b/content/docs/create-pull-request/index.html
index 7b72ef2..be7ba61 100644
--- a/content/docs/create-pull-request/index.html
+++ b/content/docs/create-pull-request/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/documentation/index.html
----------------------------------------------------------------------
diff --git a/content/docs/documentation/index.html 
b/content/docs/documentation/index.html
index 2d986d4..40e100d 100644
--- a/content/docs/documentation/index.html
+++ b/content/docs/documentation/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/faq/index.html
----------------------------------------------------------------------
diff --git a/content/docs/faq/index.html b/content/docs/faq/index.html
index f3bd202..2b0a03e 100644
--- a/content/docs/faq/index.html
+++ b/content/docs/faq/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/filter-by-sql92-example/index.html
----------------------------------------------------------------------
diff --git a/content/docs/filter-by-sql92-example/index.html 
b/content/docs/filter-by-sql92-example/index.html
index 2d19eed..e247be7 100644
--- a/content/docs/filter-by-sql92-example/index.html
+++ b/content/docs/filter-by-sql92-example/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/motivation/index.html
----------------------------------------------------------------------
diff --git a/content/docs/motivation/index.html 
b/content/docs/motivation/index.html
index 45486e6..7c949b8 100644
--- a/content/docs/motivation/index.html
+++ b/content/docs/motivation/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/order-example/index.html
----------------------------------------------------------------------
diff --git a/content/docs/order-example/index.html 
b/content/docs/order-example/index.html
index 4442c35..ee24811 100644
--- a/content/docs/order-example/index.html
+++ b/content/docs/order-example/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/pull-request/index.html
----------------------------------------------------------------------
diff --git a/content/docs/pull-request/index.html 
b/content/docs/pull-request/index.html
index e09d547..dd34f27 100644
--- a/content/docs/pull-request/index.html
+++ b/content/docs/pull-request/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/quick-start/index.html
----------------------------------------------------------------------
diff --git a/content/docs/quick-start/index.html 
b/content/docs/quick-start/index.html
index 420ec09..33b116d 100644
--- a/content/docs/quick-start/index.html
+++ b/content/docs/quick-start/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/release-manual.html
----------------------------------------------------------------------
diff --git a/content/docs/release-manual.html b/content/docs/release-manual.html
index 2d63226..0744d9b 100644
--- a/content/docs/release-manual.html
+++ b/content/docs/release-manual.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/rmq-arc/index.html
----------------------------------------------------------------------
diff --git a/content/docs/rmq-arc/index.html b/content/docs/rmq-arc/index.html
index 8c4e443..1d79550 100644
--- a/content/docs/rmq-arc/index.html
+++ b/content/docs/rmq-arc/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/rmq-deployment/index.html
----------------------------------------------------------------------
diff --git a/content/docs/rmq-deployment/index.html 
b/content/docs/rmq-deployment/index.html
index c6bd9f3..5c93ba3 100644
--- a/content/docs/rmq-deployment/index.html
+++ b/content/docs/rmq-deployment/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/roadmap/index.html
----------------------------------------------------------------------
diff --git a/content/docs/roadmap/index.html b/content/docs/roadmap/index.html
index 1c35ca6..1e82dc7 100644
--- a/content/docs/roadmap/index.html
+++ b/content/docs/roadmap/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/schedule-example/index.html
----------------------------------------------------------------------
diff --git a/content/docs/schedule-example/index.html 
b/content/docs/schedule-example/index.html
index c5954aa..a7c94ff 100644
--- a/content/docs/schedule-example/index.html
+++ b/content/docs/schedule-example/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/docs/simple-example/index.html
----------------------------------------------------------------------
diff --git a/content/docs/simple-example/index.html 
b/content/docs/simple-example/index.html
index f9921e6..a22054e 100644
--- a/content/docs/simple-example/index.html
+++ b/content/docs/simple-example/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/dowloading/releases/index.html
----------------------------------------------------------------------
diff --git a/content/dowloading/releases/index.html 
b/content/dowloading/releases/index.html
index 8942217..f7bc04a 100644
--- a/content/dowloading/releases/index.html
+++ b/content/dowloading/releases/index.html
@@ -57,11 +57,7 @@
 
 
   <meta property="og:type" content="article">
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-  <meta property="article:published_time" content="2017-06-08T17:05:00+08:00">
-=======
-  <meta property="article:published_time" content="2017-06-08T17:07:42+08:00">
->>>>>>> Build
+  <meta property="article:published_time" content="2017-06-08T17:11:46+08:00">
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/feed.xml
----------------------------------------------------------------------
diff --git a/content/feed.xml b/content/feed.xml
index 676a4c3..6ecc9ef 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -1,8 +1,4 @@
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-<?xml version="1.0" encoding="utf-8"?><feed 
xmlns="http://www.w3.org/2005/Atom"; ><generator uri="https://jekyllrb.com/"; 
version="3.4.3">Jekyll</generator><link href="/feed.xml" rel="self" 
type="application/atom+xml" /><link href="/" rel="alternate" type="text/html" 
/><updated>2017-06-08T17:05:00+08:00</updated><id>/</id><title 
type="html">Apache RocketMQ</title><subtitle>The homepage of 
RocketMQ.</subtitle><author><name>{&quot;name&quot;=&gt;nil, 
&quot;avatar&quot;=&gt;&quot;/assets/images/rmq-logo.png&quot;, 
&quot;bio&quot;=&gt;&quot;A fast, low latency, reliable, scalable, distributed 
MOM.&quot;, &quot;location&quot;=&gt;&quot;Hangzhou, China&quot;, 
&quot;email&quot;=&gt;&quot;d...@rocketmq.incubator.apache.org&quot;, 
&quot;uri&quot;=&gt;&quot;http://incubator.staging.apache.org/projects/rocketmq.html&quot;,
 &quot;bitbucket&quot;=&gt;nil, &quot;codepen&quot;=&gt;nil, 
&quot;dribbble&quot;=&gt;nil, &quot;flickr&quot;=&gt;nil, 
&quot;facebook&quot;=&gt;nil, &quot;foursquare&quot;=&gt;n
 il, &quot;github&quot;=&gt;&quot;apache/incubator-rocketmq&quot;, 
&quot;google_plus&quot;=&gt;nil, &quot;keybase&quot;=&gt;nil, 
&quot;instagram&quot;=&gt;nil, &quot;lastfm&quot;=&gt;nil, 
&quot;linkedin&quot;=&gt;nil, &quot;pinterest&quot;=&gt;nil, 
&quot;soundcloud&quot;=&gt;nil, 
&quot;stackoverflow&quot;=&gt;&quot;questions/tagged/rocketmq&quot;, 
&quot;steam&quot;=&gt;nil, &quot;tumblr&quot;=&gt;nil, 
&quot;twitter&quot;=&gt;&quot;ApacheRocketMQ&quot;, &quot;vine&quot;=&gt;nil, 
&quot;weibo&quot;=&gt;nil, &quot;xing&quot;=&gt;nil, 
&quot;youtube&quot;=&gt;nil, 
&quot;quora&quot;=&gt;&quot;topic/RocketMQ&quot;}</name><email>d...@rocketmq.incubator.apache.org</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title
 type="html">Release Notes - Apache RocketMQ - Version 
4.1.0-incubating</title><link href="/release-notes-4.1.0-incubating/" 
rel="alternate" type="text/html" title="Release Notes - Apache RocketMQ - 
Version 4.1.0-incubating" /><published>
 
2017-06-02T00:00:00+08:00</published><updated>2017-06-02T00:00:00+08:00</updated><id>/release-notes-4.1.0-incubating</id><content
 type="html" xml:base="/release-notes-4.1.0-incubating/">&lt;p&gt;Release Notes 
- Apache RocketMQ - Version 4.1.0-incubating&lt;/p&gt;
-=======
-<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" 
href="/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom";><generator 
uri="http://jekyllrb.com"; version="3.3.1">Jekyll</generator><link 
href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" 
rel="alternate" type="text/html" 
/><updated>2017-06-08T17:07:42+08:00</updated><id>//</id><title 
type="html">Apache RocketMQ</title><subtitle>The homepage of 
RocketMQ.</subtitle><author><name>{&quot;name&quot;=&gt;nil, 
&quot;avatar&quot;=&gt;&quot;/assets/images/rmq-logo.png&quot;, 
&quot;bio&quot;=&gt;&quot;A fast, low latency, reliable, scalable, distributed 
MOM.&quot;, &quot;location&quot;=&gt;&quot;Hangzhou, China&quot;, 
&quot;email&quot;=&gt;&quot;d...@rocketmq.incubator.apache.org&quot;, 
&quot;uri&quot;=&gt;&quot;http://incubator.staging.apache.org/projects/rocketmq.html&quot;,
 &quot;bitbucket&quot;=&gt;nil, &quot;codepen&quot;=&gt;nil, 
&quot;dribbble&quot;=&gt;nil, &quot;flickr&quot;=&gt;nil, &quo
 t;facebook&quot;=&gt;nil, &quot;foursquare&quot;=&gt;nil, 
&quot;github&quot;=&gt;&quot;apache/incubator-rocketmq&quot;, 
&quot;google_plus&quot;=&gt;nil, &quot;keybase&quot;=&gt;nil, 
&quot;instagram&quot;=&gt;nil, &quot;lastfm&quot;=&gt;nil, 
&quot;linkedin&quot;=&gt;nil, &quot;pinterest&quot;=&gt;nil, 
&quot;soundcloud&quot;=&gt;nil, 
&quot;stackoverflow&quot;=&gt;&quot;questions/tagged/rocketmq&quot;, 
&quot;steam&quot;=&gt;nil, &quot;tumblr&quot;=&gt;nil, 
&quot;twitter&quot;=&gt;&quot;ApacheRocketMQ&quot;, &quot;vine&quot;=&gt;nil, 
&quot;weibo&quot;=&gt;nil, &quot;xing&quot;=&gt;nil, 
&quot;youtube&quot;=&gt;nil, 
&quot;quora&quot;=&gt;&quot;topic/RocketMQ&quot;}</name><email>d...@rocketmq.incubator.apache.org</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title
 type="html">Release Notes - Apache RocketMQ - Version 
4.1.0-incubating</title><link href="/release-notes-4.1.0-incubating/" 
rel="alternate" type="text/html" title="Release Notes - Apa
 che RocketMQ - Version 4.1.0-incubating" 
/><published>2017-06-02T00:00:00+08:00</published><updated>2017-06-02T00:00:00+08:00</updated><id>/release-notes-4.1.0-incubating</id><content
 type="html" xml:base="/release-notes-4.1.0-incubating/">&lt;p&gt;Release Notes 
- Apache RocketMQ - Version 4.1.0-incubating&lt;/p&gt;
->>>>>>> Build
+<?xml version="1.0" encoding="utf-8"?><?xml-stylesheet type="text/xml" 
href="/feed.xslt.xml"?><feed xmlns="http://www.w3.org/2005/Atom";><generator 
uri="http://jekyllrb.com"; version="3.3.1">Jekyll</generator><link 
href="/feed.xml" rel="self" type="application/atom+xml" /><link href="/" 
rel="alternate" type="text/html" 
/><updated>2017-06-08T17:11:46+08:00</updated><id>//</id><title 
type="html">Apache RocketMQ</title><subtitle>The homepage of 
RocketMQ.</subtitle><author><name>{&quot;name&quot;=&gt;nil, 
&quot;avatar&quot;=&gt;&quot;/assets/images/rmq-logo.png&quot;, 
&quot;bio&quot;=&gt;&quot;A fast, low latency, reliable, scalable, distributed 
MOM.&quot;, &quot;location&quot;=&gt;&quot;Hangzhou, China&quot;, 
&quot;email&quot;=&gt;&quot;d...@rocketmq.incubator.apache.org&quot;, 
&quot;uri&quot;=&gt;&quot;http://incubator.staging.apache.org/projects/rocketmq.html&quot;,
 &quot;bitbucket&quot;=&gt;nil, &quot;codepen&quot;=&gt;nil, 
&quot;dribbble&quot;=&gt;nil, &quot;flickr&quot;=&gt;nil, &quo
 t;facebook&quot;=&gt;nil, &quot;foursquare&quot;=&gt;nil, 
&quot;github&quot;=&gt;&quot;apache/incubator-rocketmq&quot;, 
&quot;google_plus&quot;=&gt;nil, &quot;keybase&quot;=&gt;nil, 
&quot;instagram&quot;=&gt;nil, &quot;lastfm&quot;=&gt;nil, 
&quot;linkedin&quot;=&gt;nil, &quot;pinterest&quot;=&gt;nil, 
&quot;soundcloud&quot;=&gt;nil, 
&quot;stackoverflow&quot;=&gt;&quot;questions/tagged/rocketmq&quot;, 
&quot;steam&quot;=&gt;nil, &quot;tumblr&quot;=&gt;nil, 
&quot;twitter&quot;=&gt;&quot;ApacheRocketMQ&quot;, &quot;vine&quot;=&gt;nil, 
&quot;weibo&quot;=&gt;nil, &quot;xing&quot;=&gt;nil, 
&quot;youtube&quot;=&gt;nil, 
&quot;quora&quot;=&gt;&quot;topic/RocketMQ&quot;}</name><email>d...@rocketmq.incubator.apache.org</email><uri>http://incubator.staging.apache.org/projects/rocketmq.html</uri></author><entry><title
 type="html">Release Notes - Apache RocketMQ - Version 
4.1.0-incubating</title><link href="/release-notes-4.1.0-incubating/" 
rel="alternate" type="text/html" title="Release Notes - Apa
 che RocketMQ - Version 4.1.0-incubating" 
/><published>2017-06-02T00:00:00+08:00</published><updated>2017-06-02T00:00:00+08:00</updated><id>/release-notes-4.1.0-incubating</id><content
 type="html" xml:base="/release-notes-4.1.0-incubating/">&lt;p&gt;Release Notes 
- Apache RocketMQ - Version 4.1.0-incubating&lt;/p&gt;
 
 &lt;h2 id=&quot;new-feature&quot;&gt;New Feature&lt;/h2&gt;
 

http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-site/blob/6f985233/content/sitemap.xml
----------------------------------------------------------------------
diff --git a/content/sitemap.xml b/content/sitemap.xml
index f9d1311..e16fa56 100644
--- a/content/sitemap.xml
+++ b/content/sitemap.xml
@@ -1,122 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 
http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"; 
xmlns="http://www.sitemaps.org/schemas/sitemap/0.9";>
 <url>
-<<<<<<< 2b34546d8f2728c847cfb22f108b68ad8574b387
-<loc>/about/team/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/about/contact/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/about/rewards/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/quick-start/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/motivation/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/core-concept/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/cli-admin-tool/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/cluster-deployment/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/pull-request/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/code-guidelines/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/documentation/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/faq/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/release-manual</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/dowloading/releases/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/roadmap/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/batch-example/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/broadcast-example/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/rmq-deployment/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/order-example/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/rmq-arc/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/schedule-example/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/simple-example/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/filter-by-sql92-example/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/best-practice-broker/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/best-practice-consumer/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/create-pull-request/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/best-practice-namesvr/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/docs/best-practice-producer/</loc>
-<lastmod>2017-06-08T17:05:00+08:00</lastmod>
-</url>
-<url>
-<loc>/rocketmq/how-to-support-more-queues-in-rocketmq/</loc>
-<lastmod>2016-12-23T00:00:00+08:00</lastmod>
-=======
 <loc>/release-notes-4.1.0-incubating/</loc>
 <lastmod>2017-06-02T00:00:00+08:00</lastmod>
 </url>
@@ -241,7 +125,6 @@
 </url>
 <url>
 <loc>/docs/best-practice-producer/</loc>
->>>>>>> Build
 </url>
 <url>
 <loc>/categories/</loc>

Reply via email to