[incubator-servicecomb-website] branch master updated: SCB-552 translate doc 'service_center_downloads' for website (#80)

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/master by this push:
 new d1320c3  SCB-552 translate doc 'service_center_downloads' for website 
(#80)
d1320c3 is described below

commit d1320c3d852b327baf5e8b425f9afaa320db4c17
Author: lijasonvip 
AuthorDate: Tue May 8 13:59:13 2018 +0800

SCB-552 translate doc 'service_center_downloads' for website (#80)

Signed-off-by: lijasonvip 
---
 _release/cn/service_center_downloads.md | 23 +++
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/_release/cn/service_center_downloads.md 
b/_release/cn/service_center_downloads.md
index da43238..961861a 100644
--- a/_release/cn/service_center_downloads.md
+++ b/_release/cn/service_center_downloads.md
@@ -1,5 +1,5 @@
 ---
-title: "ServiceComb Service-Center Downloads"
+title: "ServiceComb Service-Center下载"
 lang: cn
 ref: release
 permalink: /cn/release/service-center-downloads/
@@ -7,18 +7,17 @@ excerpt: "ServiceComb Service-Center Downloads"
 last_modified_at: 2018-03-28T00:50:43-55:00
 ---
 
-## Releases
+## 发布包
 
 * Apache ServiceComb (incubating) Service-Center 1.0.0-m1
-- Source 
[[src]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-src.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-src.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubatin
 [...]
-- Windows 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m
 [...]
-- Linux 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apac
 [...]
+- 源码 
[[src]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-src.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-src.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-se
 [...]
+- Windows版本 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-windows-amd64.tar.gz.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0
 [...]
+- Linux版本 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/apache-servicecomb-incubating-service-center-1.0.0-m1-linux-amd64.tar.gz.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/1.0.0-m1/ap
 [...]
 
-**Verifying the release**
+**发布包验证**
 
-It is essential that you verify the integrity of the downloaded files using 
the PGP or SHA signatures.
- The PGP signatures can  be verified using GPG or PGP. 
- Please download the 
[KEYS](https://www.apache.org/dist/incubator/servicecomb/KEYS){:target="_blank"}
 as well as the asc signature files for relevant distribution. It is 
recommended to get these files from the main distribution 
[directory](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-service-center/){:target="_blank"}
 and not from the mirrors.

[incubator-servicecomb-website] branch master updated: SCB-553 translate doc 'java_chassis_downloads' for website (#81)

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 0ad0608  SCB-553 translate doc 'java_chassis_downloads' for website 
(#81)
0ad0608 is described below

commit 0ad06087c691b6f8806355bfa06db041de71f880
Author: lijasonvip 
AuthorDate: Tue May 8 13:58:32 2018 +0800

SCB-553 translate doc 'java_chassis_downloads' for website (#81)

Signed-off-by: lijasonvip 
---
 _release/cn/java_chassis_downloads.md | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/_release/cn/java_chassis_downloads.md 
b/_release/cn/java_chassis_downloads.md
index 42168b7..f0d39b2 100644
--- a/_release/cn/java_chassis_downloads.md
+++ b/_release/cn/java_chassis_downloads.md
@@ -1,5 +1,5 @@
 ---
-title: "ServiceComb Java-Chassis Downloads"
+title: "ServiceComb Java-Chassis下载"
 lang: cn
 ref: release
 permalink: /cn/release/java-chassis-downloads/
@@ -7,17 +7,15 @@ excerpt: "ServiceComb Java-Chassis Downloads"
 last_modified_at: 2018-03-28T00:50:43-55:00
 ---
 
-## Releases
+## 发布包
 
 * Apache ServiceComb (incubating) Service-Center 1.0.0-m1
-- Source 
[[src]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-src.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-src.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servi
 [...]
-- Distribution 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-bin.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-bin.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apa
 [...]
+- 源码 
[[src]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-src.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-src.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-serviceco
 [...]
+- 发布包 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-bin.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servicecomb-incubating-java-chassis-distribution-1.0.0-m1-bin.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/1.0.0-m1/apache-servi
 [...]
 
-**Verifying the release**
+**发布包验证**
 
-It is essential that you verify the integrity of the downloaded files using 
the PGP or SHA signatures.
- The PGP signatures can  be verified using GPG or PGP. 
- Please download the 
[KEYS](https://www.apache.org/dist/incubator/servicecomb/KEYS){:target="_blank"}
 as well as the asc signature files for relevant distribution. It is 
recommended to get these files from the main distribution 
[directory](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/){:target="_blank"}
 and not from the mirrors.
+使用PGP或SHA签名验证下载文件的完整性是很有必要的。PGP签名可以使用GPG或PGP进行验证，请下载 
[KEYS](https://www.apache.org/dist/incubator/servicecomb/KEYS)以及相关发行的asc签名文件。建议从主发行[目录](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/){:target="_blank"}
 中获取这些文件，而不是从镜像中获取这些文件。
  ```
  gpg -i KEYS
  
@@ -29,9 +27,9 @@ It is essential that you verify the integrity of the 
downloaded files using the
  
  pgp -ka KEYS
 
-```
+ ```
 
-To verify the binaries/sources you can download the relevant asc files for it 
from main distribution directory and follow the below guide.
+要验证二进制文件或源代码，您可以从主发行目录下载相关的asc文件并按照以下指南进行操作。
 
 ```
 gpg --verify apache-servicecomb-incubating-java-chassis-.asc 
apache-servicecomb-incubating-java-chassis-*
@@ -47,5 +45,4 @@ pgp apache-servicecomb-incubating-java-chassis-.asc
 
 ```
 
-Alternatively you can download the SHA signatures from main distribution 
[repo](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-java-chassis/){:target="_blank"}
 and verify the downloads using

[incubator-servicecomb-website] branch master updated: SCB-554 translate doc 'saga_downloads' for website (#82)

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 59041a0  SCB-554 translate doc 'saga_downloads' for website (#82)
59041a0 is described below

commit 59041a00d026dfcfd9976d223867783b1356a2e9
Author: lijasonvip 
AuthorDate: Tue May 8 13:58:04 2018 +0800

SCB-554 translate doc 'saga_downloads' for website (#82)

Signed-off-by: lijasonvip 
---
 _release/cn/saga_downloads.md | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/_release/cn/saga_downloads.md b/_release/cn/saga_downloads.md
index 5881584..dd2c012 100644
--- a/_release/cn/saga_downloads.md
+++ b/_release/cn/saga_downloads.md
@@ -1,5 +1,5 @@
 ---
-title: "ServiceComb Saga Downloads"
+title: "ServiceComb Saga 下载"
 lang: cn
 ref: release
 permalink: /cn/release/saga-downloads/
@@ -7,18 +7,19 @@ excerpt: "ServiceComb Saga Downloads"
 last_modified_at: 2018-03-28T00:50:43-55:00
 ---
 
-## Releases
+## 发布包
 
 * Apache ServiceComb (incubating) Saga 0.1.0
-- Source 
[[src]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-src.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-src.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-src.zip.sha512)
-- Distribution 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-bin.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-bin.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-bin.
 [...]
+- 源码 
[[src]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-src.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-src.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-src.zip.sha512)
+- 发布包 
[[Binary]](https://apache.org/dyn/closer.cgi/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-bin.zip)
 
[[asc]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-bin.zip.asc)
 
[[sha512]](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/0.1.0/apache-servicecomb-incubating-saga-distribution-0.1.0-bin.zip.sha512)
 
 
-**Verifying the release**
+**发布包验证**
+
+使用PGP或SHA签名验证下载文件的完整性是很有必要的。PGP签名可以使用GPG或PGP进行验证，请下载 
[KEYS](https://www.apache.org/dist/incubator/servicecomb/KEYS)以及相关发行的asc签名文件。
+
+建议从主发行[目录](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/)中获取这些文件，而不是从镜像中获取这些文件。
 
-It is essential that you verify the integrity of the downloaded files using 
the PGP or SHA signatures.
- The PGP signatures can  be verified using GPG or PGP. 
- Please download the 
[KEYS](https://www.apache.org/dist/incubator/servicecomb/KEYS){:target="_blank"}
 as well as the asc signature files for relevant distribution. It is 
recommended to get these files from the main distribution 
[directory](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/){:target="_blank"}
 and not from the mirrors.
  ```
  gpg -i KEYS
  
@@ -30,9 +31,9 @@ It is essential that you verify the integrity of the 
downloaded files using the
  
  pgp -ka KEYS
 
-```
+ ```
 
-To verify the binaries/sources you can download the relevant asc files for it 
from main distribution directory and follow the below guide.
+要验证二进制文件或源代码，您可以从主发行目录下载相关的asc文件并按照以下指南进行操作。
 
 ```
 gpg --verify apache-servicecomb-incubating-saga.asc 
apache-servicecomb-incubating-saga-*
@@ -48,4 +49,4 @@ pgp apache-servicecomb-incubating-saga-.asc
 
 ```
 
-Alternatively you can download the SHA signatures from main distribution 
[repo](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/){:target="_blank"}
 and verify the downloads using sha512sum.
+另外，您也可以从主发行[仓库](https://www.apache.org/dist/incubator/servicecomb/incubator-servicecomb-saga/){:target="_blank"}下载SHA签名并使用sha512sum验证。

-- 
To stop receiving notification

[incubator-servicecomb-website] branch master updated: SCB-551 translate set up write access for committer (#79)

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 895b18b  SCB-551 translate set up write access for committer (#79)
895b18b is described below

commit 895b18b9f103b094380d7202541fdd22b7c33cc7
Author: lijasonvip 
AuthorDate: Tue May 8 13:57:16 2018 +0800

SCB-551 translate set up write access for committer (#79)
---
 _developers/cn/setup-committer-rights.md | 54 
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/_developers/cn/setup-committer-rights.md 
b/_developers/cn/setup-committer-rights.md
index 796f1ac..38b53e8 100644
--- a/_developers/cn/setup-committer-rights.md
+++ b/_developers/cn/setup-committer-rights.md
@@ -1,61 +1,61 @@
 ---
-title: "Set Up Write Access for Committer"
-lang: cn 
+title: "Committer权限设置"
+lang: cn
 ref: setup-committer-rights
 permalink: /cn/developers/setup-committer-rights/
 excerpt: "How to set up repo write rights for committer"
-last_modified_at: 2017-12-22T14:49:00
+last_modified_at: 2018-05-08T14:49:00
 ---
 
 {% include toc %}
 
-Congratulations for being a valuable committer to Apache ServiceComb projects!
+恭喜您成为Apache ServiceComb 项目宝贵的 committer !
 
-This article will guide you through setting up write access to [Apache 
ServiceComb 
repositories](https://github.com/apache?utf8=%E2%9C%93=servicecomb==)
 hosted on Github.
+本文将指导您设置对 Github 上托管的 Apache ServiceComb 仓库的权限。
 
-You need to complete three simple steps to obtain such rights, if you are 
already an Apache ServiceComb committer:
-* Authorize your Apache account
-* Authorize your Github account
-* Join Apache Github organization
+如果您已经是Apache ServiceComb 项目的 committer，需要完成下面三个简单的步骤才能获得这些权限：
 
-Open [https://gitbox.apache.org/setup/](https://gitbox.apache.org/setup/) in 
your favorite browser and you should see a page like below. 
+* 对 Apache 账号授权
+* 对 Github 账号授权
+* 加入 Apache Github 组织
+
+在您喜欢的浏览器中打开 
[https://gitbox.apache.org/setup/](https://gitbox.apache.org/setup/) 
，您应该能看到如下所示的页面
 
 ![pre authorization]({{ site.url }}{{ site.baseurl 
}}/assets/images/gitbox/apache-pre-auth.png){: .align-center}
 
-Let\'s get started!
+接下来开始授权！
 
-## Authorize your Apache account
-Click `Start ASF Oauth` link and follow the instructions on the page to log in 
with your Apache account.
+## 授权 Apache 账户
+点击 `Start ASF Oauth` 链接并按照页面上的说明使用您的 Apache 账号登录。
 
 ![apache account authorization]({{ site.url }}{{ site.baseurl 
}}/assets/images/gitbox/apache-auth.png){: .align-center}
 
-## Authorize your Github account
-Before proceeding, enable [2FA on 
Github](https://github.com/settings/security) for your account.
+## 授权 Github 账户
+首先需要在 Github 账号上[启用2FA](https://github.com/settings/security) 安全设置。
 
-Your Github account security page should look like the image below, if 2FA is 
set up successfully.
+如果2FA成功设置，您的Github账号安全设置页面应如下图所示。
 
 ![github 2FA]({{ site.url }}{{ site.baseurl 
}}/assets/images/gitbox/github-2fa.png){: .align-center}
 
-If you need help, please refer to [Github 2FA help 
page](https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/)
+更多安全设置资料请参考 [Github 2FA 
资料](https://help.github.com/articles/securing-your-account-with-two-factor-authentication-2fa/)。
 
-Once your Github 2FA is set up, click `Auth on GitHub` and follow the 
instructions to authorize your Github account.
+设置好 Github 2FA后，点击 `Auth on GitHub` 并按照说明授权Github 账号。
 
 ![github account authorization]({{ site.url }}{{ site.baseurl 
}}/assets/images/gitbox/github-auth.png){: .align-center}
 
-## Join Apache Github organization
-Open [https://id.apache.org/](https://id.apache.org/) and log into your Apache 
account.
+## 加入 Apache Github 组织
+打开 [https://id.apache.org/](https://id.apache.org/) 并登陆到您的 Apache 账户。
+
+登陆后，填写您的 github 账户用户名并保存：
 
-Once logged in, fill in your github username under *Your Github Username* 
section like below and save your changes:
- 
 ![github account linking]({{ site.url }}{{ site.baseurl 
}}/assets/images/gitbox/link-apache-github-id.png){: .align-center}
 
-An organisational invite will be sent to you shortly thereafter (within 30 
minutes). 
-You may visit [Apache on Github](https://github.com/apache/) to see if you 
have an invitation pending. It may take up to 30 minutes.
+此后不久（30分钟内）将向您发送组织邀请，您可以在 Github 上访问 [Apache](https://github.com/apache/) 
看看是否有待处理的邀请。这可能需要30分钟。
 
-Accept the invitation and wait till you are added as an Apache ServiceComb 
project committer (you will be notified by email).
+然后接受邀请并等待您添加为 Apache ServiceComb 项目的 committer （您将通过电子邮件获取通知）。
 
-Once your write access is granted, you will see something like the image below:
+一旦您被授予权限，您将看到如下图所示的内容：
 
 ![post authorization]({{ site.url }}{{ site.baseurl 
}}/assets/images/gitbox/apache-post-auth.png){: .align-center}

[incubator-servicecomb-website] 01/02: Polish the developer guide

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 8f967490571b1771df30d4bb21f08669cd39f174
Author: Willem Jiang 
AuthorDate: Tue May 8 11:01:28 2018 +0800

Polish the developer guide
---
 _data/navigation.yml| 2 +-
 _developers/cn/release_guide.md | 2 ++
 _developers/cn/setup-develop-environment.md | 4 +++-
 _developers/cn/submit-codes.md  | 8 
 _developers/release_guide.md| 2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/_data/navigation.yml b/_data/navigation.yml
index 30b72a6..2d5401c 100755
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -294,7 +294,7 @@ t:
 url: /cn/developers/use-jira/
   - title: "设置代码仓库写权限"
 url: /cn/developers/setup-committer-rights/
-  - title: "How to Release in Apache"
+  - title: "Servicecomb发版指南"
 url: /cn/developers/release-guide/
 
 faqs:
diff --git a/_developers/cn/release_guide.md b/_developers/cn/release_guide.md
index 639c07d..0db48df 100644
--- a/_developers/cn/release_guide.md
+++ b/_developers/cn/release_guide.md
@@ -11,6 +11,8 @@ redirect_from:
   - /theme-setup/
 ---
 
+{% include toc %}
+
 本文向大家介绍如何在Apache上进行ServiceComb项目发版.
 
 ## 前期准备
diff --git a/_developers/cn/setup-develop-environment.md 
b/_developers/cn/setup-develop-environment.md
index 270802e..cf2c242 100644
--- a/_developers/cn/setup-develop-environment.md
+++ b/_developers/cn/setup-develop-environment.md
@@ -7,6 +7,8 @@ excerpt: "开发环境准备"
 last_modified_at: 2017-06-24T18:48:43+08:00
 ---
 
+{% include toc %}
+
 ## 基本环境准备
 在您开始前，请确保以下应用已安装：
 * 
**Git**，安装详情可参考[Git安装教程](https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git){:target="_blank"}
@@ -31,7 +33,7 @@ last_modified_at: 2017-06-24T18:48:43+08:00
```bash
git clone https://github.com/apache/incubator-servicecomb-java-chassis.git
```
-   
+
 ## IDE 环境配置
 现有支持Java开发的IDE很多，如Eclipse, IntelliJ IDEA和STS等。我们在此推荐使用IntelliJ 
IDEA，对于日常开发，其社区版的功能已经足够了。在安装完IntelliJ 
IDEA后，您可以根据[初始化设置教程](https://www.jetbrains.com/help/idea/installing-and-launching.html#d325787e291)对IntelliJ
 
IDEA进行配置，随后可通过阅读[必备快捷键](https://www.jetbrains.com/help/idea/keyboard-shortcuts-you-cannot-miss.html)了解常用的快捷键。
 
diff --git a/_developers/cn/submit-codes.md b/_developers/cn/submit-codes.md
index 3610b33..0177ab4 100644
--- a/_developers/cn/submit-codes.md
+++ b/_developers/cn/submit-codes.md
@@ -1,6 +1,6 @@
 ---
 title: "代码提交指南"
-lang: cn 
+lang: cn
 ref: submit-codes
 permalink: /cn/developers/submit-codes/
 excerpt: "介绍如何向 ServiceComb 项目提交代码"
@@ -85,11 +85,11 @@ last_modified_at: 2017-09-08T20:26:43-20:46
 　　在浏览器切换到自己的 github 页面，切换分支到提交的分支 \ ，依次点击 `New pull 
request` 和 `Create pull request` 按钮进行创建，如下图所示：
 
 ![体质指数应用运行界面](/assets/images/new-pr.jpg){: .align-center}
-fig-1 New pull request 
+fig-1 New pull request
 {: .figure-caption}
 
 ![体质指数应用运行界面](/assets/images/create-pr.jpg){: .align-center}
-fig-2 Create pull request 
+fig-2 Create pull request
 {: .figure-caption}
 
 　　至此，您的PR创建完成，更多关于 PR 请阅读 
[collaborating-with-issues-and-pull-requests](https://help.github.com/categories/collaborating-with-issues-and-pull-requests/)
 。
@@ -106,7 +106,7 @@ fig-2 Create pull request
```
 3. 切换回刚才的分支（假设分支名为fix）
```bash
-   git checkout fix 
+   git checkout fix
```
 4. 进行rebase
```bash
diff --git a/_developers/release_guide.md b/_developers/release_guide.md
index 78007f3..50d7b7d 100644
--- a/_developers/release_guide.md
+++ b/_developers/release_guide.md
@@ -10,7 +10,7 @@ tags: [release]
 redirect_from:
   - /theme-setup/
 ---
-
+{% include toc %}
 
 This Guide helps you to do the release in Apache for ServiceComb projects.
 

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] 02/02: Publish the website

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 51f9ab1c001db5b11006b79f83e7dc09b7760f51
Author: Willem Jiang 
AuthorDate: Tue May 8 11:02:56 2018 +0800

Publish the website
---
 content/cn/developers/index.html   |  2 +-
 content/cn/developers/release-guide/index.html | 18 +++--
 .../developers/setup-committer-rights/index.html   |  2 +-
 .../setup-develop-environment/index.html   | 31 ++
 content/cn/developers/submit-codes/index.html  |  4 +--
 .../cn/developers/subscribe-mail-list/index.html   |  2 +-
 content/cn/developers/use-jira/index.html  |  2 +-
 content/developers/release-guide/index.html| 16 ++-
 content/feed.xml   |  2 +-
 9 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/content/cn/developers/index.html b/content/cn/developers/index.html
index 0784e25..841a898 100644
--- a/content/cn/developers/index.html
+++ b/content/cn/developers/index.html
@@ -327,7 +327,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
diff --git a/content/cn/developers/release-guide/index.html 
b/content/cn/developers/release-guide/index.html
index 6c15615..f12d01e 100644
--- a/content/cn/developers/release-guide/index.html
+++ b/content/cn/developers/release-guide/index.html
@@ -329,7 +329,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
@@ -362,7 +362,21 @@
   
 
   
-本文向大家介绍如何在Apache上进行ServiceComb项目发版.
+
+
+
+
+  前期准备
+  配置Maven
+  发行Service-Center
+  发行Java-Chassis
+  发行Saga
+
+
+  
+
+
+本文向大家介绍如何在Apache上进行ServiceComb项目发版.
 
 前期准备
 
diff --git a/content/cn/developers/setup-committer-rights/index.html 
b/content/cn/developers/setup-committer-rights/index.html
index 835cf90..4bcd390 100644
--- a/content/cn/developers/setup-committer-rights/index.html
+++ b/content/cn/developers/setup-committer-rights/index.html
@@ -327,7 +327,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
diff --git a/content/cn/developers/setup-develop-environment/index.html 
b/content/cn/developers/setup-develop-environment/index.html
index e57a6c7..1063837 100644
--- a/content/cn/developers/setup-develop-environment/index.html
+++ b/content/cn/developers/setup-develop-environment/index.html
@@ -327,7 +327,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
@@ -360,7 +360,23 @@
   
 
   
-基本环境准备
+
+
+
+
+  基本环境准备
+  Git配置
+  IDE 环境配置
+  IntelliJ IDEA 配置
+
+  
+  下一步
+
+
+  
+
+
+基本环境准备
 在您开始前，请确保以下应用已安装：
 
   Git，安装详情可参考https://git-scm.com/book/zh/v2/%E8%B5%B7%E6%AD%A5-%E5%AE%89%E8%A3%85-Git; 
target="_blank">Git安装教程
@@ -403,16 +419,9 @@ git config --global user.email your-email-address
 
 
 
-
-  基本环境准备
-  Git配置
-  IDE 环境配置
-  IntelliJ IDEA 配置
+
+  Auto generated table of contents
 
-  
-  下一步
-
-
   
 
 
diff --git a/content/cn/developers/submit-codes/index.html 
b/content/cn/developers/submit-codes/index.html
index 6235310..0c50799 100644
--- a/content/cn/developers/submit-codes/index.html
+++ b/content/cn/developers/submit-codes/index.html
@@ -327,7 +327,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
@@ -489,7 +489,7 @@ fig-2 Create pull request
 
   
   切换回刚才的分支（假设分支名为fix）
-git checkout fix 
+git checkout fix
 
 
   
diff --git a/content/cn/developers/subscribe-mail-list/index.html 
b/content/cn/developers/subscribe-mail-list/index.html
index 1531dcb..609d411 100644
--- a/content/cn/developers/subscribe-mail-list/index.html
+++ b/content/cn/developers/subscribe-mail-list/index.html
@@ -327,7 +327,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
diff --git a/content/cn/developers/use-jira/index.html 
b/content/cn/developers/use-jira/index.html
index 04f28fb..ace557e 100644
--- a/content/cn/developers/use-jira/index.html
+++ b/content/cn/developers/use-jira/index.html
@@ -327,7 +327,7 @@
   
   
 
-  How to Release in Apache
+  Servicecomb发版指南
 
 
 
diff --git a/content/developers/release-guide/index.html 
b/content/developers/release-guide/index.html
index 749aaa6..77bd4b3 100644
--- a/content/developers/release-guide/index.html
+++ b/content/developers/release-guide/index.html
@@ -350,7 +350,21 @@
   
 
   
-This Guide helps you to do the release in Apache for ServiceComb 
projects.
+
+
+
+
+  Pre-Requisite
+  Maven 2 
Setup
+  Major Steps for 
doing

[incubator-servicecomb-website] branch asf-site updated (f7936db -> 1cce009)

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git.


from f7936db  publish the website
 add 3ad0f84  SCB-528 Translate release guide to Chinese (#78)
 new 825ece4  Merge branch 'master' into asf-site
 new 8a8a312  SCB-528 changed the release_guide.md encoding to UTF-8
 new 1cce009  Publish the website

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 _developers/cn/release_guide.md| 267 +++-
 _developers/release_guide.md   |   2 +-
 content/cn/developers/release-guide/index.html | 276 +++--
 content/developers/release-guide/index.html|   2 +-
 content/feed.xml   |   2 +-
 content/sitemap.xml|   2 +-
 6 files changed, 338 insertions(+), 213 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] 03/03: Publish the website

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 1cce0097e77604ce324849cfc426762bd5c20040
Author: Willem Jiang 
AuthorDate: Tue May 8 10:46:29 2018 +0800

Publish the website
---
 content/cn/developers/release-guide/index.html | 276 +++--
 content/developers/release-guide/index.html|   2 +-
 content/feed.xml   |   2 +-
 content/sitemap.xml|   2 +-
 4 files changed, 172 insertions(+), 110 deletions(-)

diff --git a/content/cn/developers/release-guide/index.html 
b/content/cn/developers/release-guide/index.html
index 31ca888..6c15615 100644
--- a/content/cn/developers/release-guide/index.html
+++ b/content/cn/developers/release-guide/index.html
@@ -19,7 +19,7 @@
 
 
 
-Release guide for ServiceComb - Apache ServiceComb (incubating)
+ServiceComb发版指南 - Apache ServiceComb (incubating)
 
 
 
@@ -33,7 +33,7 @@
 
 
 
-
+
 
 
   http://github.com/pages/apache/incubator-servicecomb-website/cn/developers/release-guide/;>
@@ -46,7 +46,7 @@
 
 
   
-  
+  
   
   
 
@@ -345,16 +345,16 @@
 
 
   http://schema.org/CreativeWork;>
-
+
 
 
-
+
 
 
   
 
   
-Release guide for 
ServiceComb
+ServiceComb发版指南
 
 
   
@@ -369,15 +369,71 @@
 
   项目CI应该是正常的（绿色的）。
   确定相关的项目版本号。
-  因为发版的过程中需要签名，请确保签名用的key的公钥是发布到公开的公钥服务器上的。
+  因为发版的过程中需要签名，请确保签名用密钥对应公钥已经发布到公开公钥服务器。
+  熟悉POM文件中版本发行相关的设置。
 
 
-发布Service-Center 需要做的步骤
+配置Maven
+ServiceComb Java-Chassis和Saga使用Maven进行版本发布，我们需要在发布前对Maven进行一些配置。
+
+在使用Maven把发行包发布到仓库之前，我们应当在~/.m2/settings.xml文件中配置制品为组群可写的，否则其它开发人员将无法提交相同制品的新SNAPSHOT版本。本项目参考了Maven项目的设定http://maven.apache.org/developers/committer-settings.html;>指南。请特别注意http://maven.apache.org/guides/mini/guide-encryption.html;>加密密码。
+
+settings
+  ...
+  servers
+!-- Per http://maven.apache.org/developers/committer-settings.html 
--
+
+!-- To publish a snapshot of some part of Maven --
+server
+  idapache.snapshots.https/id
+  username !-- YOUR APACHE LDAP USERNAME -- 
/username
+  password !-- YOUR APACHE LDAP PASSWORD -- 
/password
+/server
+!-- To publish a website of some part of Maven --
+server
+  idapache.website/id
+  username !-- YOUR APACHE LDAP USERNAME -- 
/username
+  filePermissions664/filePermissions
+  directoryPermissions775/directoryPermissions
+/server
+!-- To stage a release of some part of Maven --
+server
+  idapache.releases.https/id
+  username !-- YOUR APACHE LDAP USERNAME -- 
/username
+  password !-- YOUR APACHE LDAP PASSWORD -- 
/password
+/server
+!-- To stage a website of some part of Maven --
+server
+  idstagingSite/id !-- must match hard-coded 
repository identifier in site:stage-deploy --
+  username !-- YOUR APACHE LDAP USERNAME -- 
/username
+  filePermissions664/filePermissions
+  directoryPermissions775/directoryPermissions
+/server
+
+  /servers
+  ...
+  profiles
+profile
+  idapache-release/id
+  properties
+gpg.useagentfalse/gpg.useagent
+gpg.passphrase!-- YOUR GPG PASSPHRASE 
--/gpg.passphrase
+testfalse/test
+  /properties
+/profile
+
+  /profiles
+...
+/settings
+
+
+
+发行Service-Center
 
-版本制作以及验证版本
+准备和校验发行包
 
 
-  Clone the service-center code.
+  克隆service-center代码。
 g...@github.com:apache/incubator-servicecomb-service-center.git
 cd incubator-servicecomb-service-center
 gvt restore
@@ -385,307 +441,313 @@ gvt restore
 
   
   
-Create a Tag from the master branch based on the version number which 
needs to be released.
+在master分支上打上准备发布版本的标签。
   
   
-Run RAT tool to ensure no license issues are there, follow the guide 
over https://github.com/apache/incubator-servicecomb-service-center/tree/master/docs/release;>here
+运行RAT工具，检查所有源文件头都有合法的ASF声明, 请参考https://github.com/apache/incubator-servicecomb-service-center/tree/master/docs/release;>该文档。
   
   
-Run the make_release.sh to make the release for windows and linux 
following the guide over https://github.com/apache/incubator-servicecomb-service-center/tree/master/scripts/release;>here.
+运行make_release.sh脚本，请参考https://github.com/apache/incubator-servicecomb-service-center/tree/master/scripts/release;>该文档。
   
   
-Last Step will make the releases in root folder.
+上一步将会在根目录下生成发行包。
   
   
-Run the releases of frontend and service-center in both linux and 
windows.
+在Linux与Windows环境下运行前端与service-center。
   
   
-Run the https://github.com/apache/incubator-servicecomb-service-center/tree/master/integration;>integration
 test on the release.
+进行https://github.com/apache/incubator-servicecomb-service-center/tree/master/integration;>集成测试。
   
   
-If all the test passes then send the release

[incubator-servicecomb-website] 01/03: Merge branch 'master' into asf-site

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 825ece46c0728d8a658f95043932d3e177ce7c9b
Merge: f7936db 3ad0f84
Author: Willem Jiang 
AuthorDate: Tue May 8 10:25:44 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/release_guide.md | 275 
 _developers/release_guide.md|   2 +-
 2 files changed, 170 insertions(+), 107 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-website] 02/03: SCB-528 changed the release_guide.md encoding to UTF-8

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch asf-site
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-website.git

commit 8a8a31260e88d532e7632a218532aef8bc70f439
Author: Willem Jiang 
AuthorDate: Tue May 8 10:42:02 2018 +0800

SCB-528 changed the release_guide.md encoding to UTF-8
---
 _developers/cn/release_guide.md | 214 
 1 file changed, 107 insertions(+), 107 deletions(-)

diff --git a/_developers/cn/release_guide.md b/_developers/cn/release_guide.md
index fe5b59a..639c07d 100644
--- a/_developers/cn/release_guide.md
+++ b/_developers/cn/release_guide.md
@@ -1,29 +1,29 @@
 ---
-title: "ServiceCombָ��"
+title: "ServiceComb发版指南"
 lang: cn
 ref: release_guide
 permalink: /cn/developers/release-guide/
-excerpt: "ServiceCombָ�� �Apache"
+excerpt: "ServiceComb发版指南 介绍如何在Apache发版"
 last_modified_at:  2018-05-08T09:55:44+08:00
 author: Asif Siddiqui
-tags: []
+tags: [发版]
 redirect_from:
   - /theme-setup/
 ---
 
-���ҽApache�Ͻ���ServiceComb��Ŀ.
+本文向大家介绍如何在Apache上进行ServiceComb项目发版.
 
-## ǰ��׼��
+## 前期准备
 
-1. ��ĿCIӦ�ģ���ɫ�ģ���
-2. ȷص���Ŀ�汾�š�
-3. ��ΪĹ���Ҫǩ��ȷ��ǩ��Կ��Ӧ��Կ�Ѿ�Կ
-4. ��ϤPOM�ļ��а汾��صá�
+1. 项目CI应该是正常的（绿色的）。
+2. 确定相关的项目版本号。
+3. 因为发版的过程中需要签名，请确保签名用密钥对应公钥已经发布到公开公钥服务器。
+4. 熟悉POM文件中版本发行相关的设置。
 
-## Maven
-ServiceComb 
Java-Chassis��Sagaʹ��Maven���а汾Ҫ�ڷ���ǰ��MavenһЩ���á�
+## 配置Maven
+ServiceComb Java-Chassis和Saga使用Maven进行版本发布，我们需要在发布前对Maven进行一些配置。
 
-��ʹ��Maven�ѷ��аֿ�֮ǰ��Ӧ`~/.m2/settings.xml`�ļ�ƷΪ��Ⱥ��д�ģ���Ա���޷��ύ��ͬ��ƷSNAPSHOT�汾��Ŀ�ο���Maven��Ŀ���趨[ָ��](http://maven.apache.org/developers/committer-settings.html)�ر�ע��[](http://maven.apache.org/guides/mini/guide-encryption.html)��
+在使用Maven把发行包发布到仓库之前，我们应当在`~/.m2/settings.xml`文件中配置制品为组群可写的，否则其它开发人员将无法提交相同制品的新SNAPSHOT版本。本项目参考了Maven项目的设定[指南](http://maven.apache.org/developers/committer-settings.html)。请特别注意[加密密码](http://maven.apache.org/guides/mini/guide-encryption.html)。
 
 ```
 
@@ -75,223 +75,223 @@ ServiceComb Java-Chassis
 
 ```
 
-## Service-Center
+## 发行Service-Center
 
-***׼У�鷢�а�***
+***准备和校验发行包***
 
-1. ��¡service-center���롣
+1. 克隆service-center代码。
 ```
 g...@github.com:apache/incubator-servicecomb-service-center.git
 cd incubator-servicecomb-service-center
 gvt restore
 ```
 
-2. ��master��֧�ϴ���׼���汾�ı�ǩ��
+2. 在master分支上打上准备发布版本的标签。
 
-3. RAT���ߣԴ�ļ�ͷ���кϷ���ASF, 
��ο�[���ĵ�](https://github.com/apache/incubator-servicecomb-service-center/tree/master/docs/release)��
+3. 运行RAT工具，检查所有源文件头都有合法的ASF声明, 
请参考[该文档](https://github.com/apache/incubator-servicecomb-service-center/tree/master/docs/release)。
 
-4. 
`make_release.sh`�ű�ο�[���ĵ�](https://github.com/apache/incubator-servicecomb-service-center/tree/master/scripts/release)��
+4. 
运行`make_release.sh`脚本，请参考[该文档](https://github.com/apache/incubator-servicecomb-service-center/tree/master/scripts/release)。
 
-5. ��һ���ڸ�Ŀ¼�ɷ��а���
+5. 上一步将会在根目录下生成发行包。
 
-6. ��Linux��Windows��ǰservice-center��
+6. 在Linux与Windows环境下运行前端与service-center。
 
-7. 
[���ɲ���](https://github.com/apache/incubator-servicecomb-service-center/tree/master/integration)��
+7. 
进行[集成测试](https://github.com/apache/incubator-servicecomb-service-center/tree/master/integration)。
 
-8. ���ȫ�Զ�ͨ���ˣ��а��ַ���ͬ���ڲ�ͬ�Ͻ�֤��
+8. 如果以上全部测试都通过了，将发行包分发给同事在不同机器上进行验证。
 
-9. ǩ���͵ֿ⡣
+9. 将标签推送到主仓库。
 
-***�а�ǩ��***
+***给发行包签名***
 
-10. 
��GithubҪ���а汾[��ǩ](https://github.com/apache/incubator-servicecomb-service-center/tags)��Դ�
+10. 
从Github下载要发行版本[标签](https://github.com/apache/incubator-servicecomb-service-center/tags)的源码包。
 
-11. Linux���а���Windows���а���Դ�ǩУ��͡�
+11. 生成Linux发行包，Windows发行包和源码包的签名和校验和。
 
-12. 
�ϴа浽[Apache���пֿ�](https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-service-center/).
+12. 
上传发行版到[Apache发行开发仓库](https://dist.apache.org/repos/dist/dev/incubator/servicecomb/incubator-servicecomb-service-center/).
 
-13. ��SVN���ط��а�֤ǩУ�顣
+13. 从SVN下载发行包，验证签名和校验。
 
-***PPMC��׼***
+***PPMC批准***
 
-14. ͶƱ�ʼ��� ***d...@servicecomb.apache.org***�� PPMC��׼.
+14. 发送投票邮件至 ***d...@servicecomb.apache.org***， 发起PPMC批准.
 
-15. �ȴ�72Сʱ�߻��3Ʊ+1û��-1���-1Ʊ�Ⲣ��***��1��***���¿�ʼ��
+15. 等待72小时，或者获得3票+1并且没有-1。如果有-1票，修正问题并从***第1步***重新开始。
 
-16. ��ͶƱ�d...@servicecomb.apache.org��
+16. 将投票结果发布到d...@servicecomb.apache.org。
 
-***IPMC��׼***
+***IPMC批准***
 
-17. ͶƱ�ʼ���***gene...@incubator.apache.org***��IPMC��׼��
+17. 发送投票邮件至***gene...@incubator.apache.org***，发起IPMC批准。
 
-18. �ȴ�72Сʱ�߻��3Ʊ+1û��-1���-1Ʊ�Ⲣ��***��1��***���¿�ʼ��
+18. 等待72小时，或者获得3票+1并且没有-1。如果有-1票，修正问题并从***第1步***重新开始。
 
-19. ��ͶƱ�gene...@incubator.apache.org��

[incubator-servicecomb-service-center] branch master updated: Update beego version 1.8.0 (#340)

2018-05-07 Thread littlecui 
This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
 new ef3193e   Update beego version 1.8.0  (#340)
ef3193e is described below

commit ef3193e587a6e19a6abeccab522ef252517d8e7b
Author: little-cui 
AuthorDate: Mon May 7 20:04:25 2018 +0800

 Update beego version 1.8.0  (#340)

* Update beego version 1.8.0

(cherry picked from commit ef9e298)

* Update beego version 1.8.0

(cherry picked from commit ef9e298)

* Fix typos
---
 frontend/app/scripts/languages/locale-cz.js | 15 ---
 frontend/app/scripts/languages/locale-en.js |  3 ++-
 frontend/app/scripts/views/index.html   |  2 +-
 frontend/main.go|  2 +-
 vendor/manifest |  2 +-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frontend/app/scripts/languages/locale-cz.js 
b/frontend/app/scripts/languages/locale-cz.js
index 55c3e6f..a37d9a0 100644
--- a/frontend/app/scripts/languages/locale-cz.js
+++ b/frontend/app/scripts/languages/locale-cz.js
@@ -29,22 +29,22 @@ angular.module('serviceCenter')
"search": "搜索",
"name": "名称",
"status": "状态",
-   "appId": "应用程序编号",
+   "appId": "应用",
"version": "版本",
"createdAt": "创建于",
"address": "地址",
"refresh": "刷新",
-   "close": "关",
+   "close": "关闭",
"description": "描述",
"application": "应用",
"serviceInstances": "服务实例",
"serviceProviders": "服务供应商",
"serviceConsumers": "服务消费者",
-   "schema": "模式",
+   "schema": "服务契约",
"dashboard": "仪表板",
-   "up": "上线",
-   "down": "下线",
-   "starting": "开始",
+   "up": "在线",
+   "down": "离线",
+   "starting": "初始化",
"outofservice": "暂停服务",
"dashboard": "仪表板",
"getSchema": "获取契约",
@@ -59,7 +59,7 @@ angular.module('serviceCenter')
"noSchemaFound": "找不到契约",
"schemaTest": "契约测试",
"schemes": "方案",
-   "providers": "供应商",
+   "providers": "提供者",
"consumers": "消费者",
"operation": "操作",
"page": "页",
@@ -68,6 +68,7 @@ angular.module('serviceCenter')
"serviceStatistics": "服务统计",
"updated": "更新",
"footerValue": "ServiceComb",
+   "copyright": "版权所有",
"language": "语言",
"testSchema": "测试契约",
"noSchemaExists": "契约不存在",
diff --git a/frontend/app/scripts/languages/locale-en.js 
b/frontend/app/scripts/languages/locale-en.js
index 5adf6d5..98d86ac 100644
--- a/frontend/app/scripts/languages/locale-en.js
+++ b/frontend/app/scripts/languages/locale-en.js
@@ -67,7 +67,8 @@ angular.module('serviceCenter')
"of": "Of",
"serviceStatistics": "Service Statistics",
"updated": "Updated",
-   "footerValue": "Service Comb",
+   "footerValue": "ServiceComb",
+"copyright": "Copyright",
"language": "Language",
"testSchema": "Test Schema",
"noSchemaExists": "No Schema Exists",
diff --git a/frontend/app/scripts/views/index.html 
b/frontend/app/scripts/views/index.html
index ed2a675..049fc0e 100644
--- a/frontend/app/scripts/views/index.html
+++ b/frontend/app/scripts/views/index.html
@@ -65,7 +65,7 @@ limitations under the License.
   
   
   
- {{ "footerValue" | translate }}
+{{ "copyright" | translate }}{{ 
"footerValue" | translate }}
   
 
 
diff --git a/frontend/main.go b/frontend/main.go
index f350b49..dc5a9a3 100644
--- a/frontend/main.go
+++ b/frontend/main.go
@@ -32,7 +32,7 @@ func main() {
frontendIp := beego.AppConfig.String("frontend_host_ip")
frontendPort := beego.AppConfig.DefaultInt("frontend_host_port", 30103)
 
-   scIp := beego.AppConfig.DefaultString("httpadr", "127.0.0.1")
+   scIp := beego.AppConfig.DefaultString("httpaddr", "127.0.0.1")
scPort := beego.AppConfig.DefaultInt("httpport", 30100)
 
// command line flags
diff --git a/vendor/manifest b/vendor/manifest
index 68f8922..367e153 100644
--- a/vendor/manifest
+++ b/vendor/manifest
@@ -37,7 +37,7 @@
"importpath": "github.com/astaxie/beego",
"repository": "https://github.com/astaxie/beego;,
"vcs": "git",
-   "revision": "cab8458c1c4a5a3b4bf5192922be620e6dede15b",
+   "revision": "323a1c4214101331a4b71922c23d19b7409ac71f",
"branch": "HEAD",
"notests": true
},

-- 
To stop receiving notification emails like this one, please contact
little...@apache.org.

[incubator-servicecomb-saga] branch SCB-547 created (now d338daa)

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch SCB-547
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git.


  at d338daa  SCB-547 try to fix the EventScanner multiple AbortedGlobalTx 
issue

This branch includes the following new commits:

 new d338daa  SCB-547 try to fix the EventScanner multiple AbortedGlobalTx 
issue

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[incubator-servicecomb-saga] 01/01: SCB-547 try to fix the EventScanner multiple AbortedGlobalTx issue

2018-05-07 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch SCB-547
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git

commit d338daa4e229bd1be9429a75076db15ecf966304
Author: Willem Jiang 
AuthorDate: Mon May 7 17:36:49 2018 +0800

SCB-547 try to fix the EventScanner multiple AbortedGlobalTx issue
---
 .../apache/servicecomb/saga/alpha/core/EventScanner.java| 13 ++---
 .../servicecomb/saga/alpha/core/TxEventRepository.java  |  2 +-
 .../saga/alpha/core/TxConsistentServiceTest.java|  2 +-
 .../saga/alpha/server/SpringTxEventRepository.java  |  2 +-
 .../saga/alpha/server/TxEventEnvelopeRepository.java|  2 +-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git 
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
 
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
index 3168870..8082ab3 100644
--- 
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
+++ 
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/EventScanner.java
@@ -25,6 +25,7 @@ import static 
org.apache.servicecomb.saga.common.EventType.TxEndedEvent;
 import static org.apache.servicecomb.saga.common.EventType.TxStartedEvent;
 
 import java.lang.invoke.MethodHandles;
+import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.slf4j.Logger;
@@ -141,20 +142,26 @@ public class EventScanner implements Runnable {
   }
 
   private void updateTransactionStatus() {
-
eventRepository.findFirstAbortedGlobalTransaction().ifPresent(this::markGlobalTxEnd);
+
eventRepository.findFirstAbortedGlobalTransaction().ifPresent(this::markGlobalTxEndWithEvents);
   }
 
   private void markSagaEnded(TxEvent event) {
 if 
(commandRepository.findUncompletedCommands(event.globalTxId()).isEmpty()) {
-  markGlobalTxEnd(event);
+  markGlobalTxEntWithEvent(event);
 }
   }
 
-  private void markGlobalTxEnd(TxEvent event) {
+  private void markGlobalTxEntWithEvent(TxEvent event) {
 eventRepository.save(toSagaEndedEvent(event));
 LOG.info("Marked end of transaction with globalTxId {}", 
event.globalTxId());
   }
 
+  private void markGlobalTxEndWithEvents(List events) {
+events.forEach(event -> {
+  markGlobalTxEntWithEvent(event);
+});
+  }
+
   private TxEvent toTxAbortedEvent(TxTimeout timeout) {
 return new TxEvent(
 timeout.serviceName(),
diff --git 
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
 
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
index c481226..f2a 100644
--- 
a/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
+++ 
b/alpha/alpha-core/src/main/java/org/apache/servicecomb/saga/alpha/core/TxEventRepository.java
@@ -42,7 +42,7 @@ public interface TxEventRepository {
* 
* @return
*/
-  Optional findFirstAbortedGlobalTransaction();
+  Optional findFirstAbortedGlobalTransaction();
 
   /**
* Find timeout {@link TxEvent}s. A timeout TxEvent satisfies below 
requirements:
diff --git 
a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
 
b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
index 8faf0e8..b0c19c8 100644
--- 
a/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
+++ 
b/alpha/alpha-core/src/test/java/org/apache/servicecomb/saga/alpha/core/TxConsistentServiceTest.java
@@ -49,7 +49,7 @@ public class TxConsistentServiceTest {
 }
 
 @Override
-public Optional findFirstAbortedGlobalTransaction() {
+public Optional findFirstAbortedGlobalTransaction() {
   return Optional.empty();
 }
 
diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
index e48a780..951e533 100644
--- 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
+++ 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/SpringTxEventRepository.java
@@ -40,7 +40,7 @@ class SpringTxEventRepository implements TxEventRepository {
   }
 
   @Override
-  public Optional findFirstAbortedGlobalTransaction() {
+  public Optional findFirstAbortedGlobalTransaction() {
 return eventRepo.findFirstAbortedGlobalTxByType();
   }
 
diff --git 
a/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxEventEnvelopeRepository.java
 
b/alpha/alpha-server/src/main/java/org/apache/servicecomb/saga/alpha/server/TxEventEnvelopeRepository.java

[incubator-servicecomb-service-center] branch master updated: SCB-544 Convenient store extension (#339)

2018-05-07 Thread littlecui 
This is an automated email from the ASF dual-hosted git repository.

littlecui pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/incubator-servicecomb-service-center.git


The following commit(s) were added to refs/heads/master by this push:
 new 37ae980  SCB-544 Convenient store extension (#339)
37ae980 is described below

commit 37ae980a8d01a88194c9edf02707e5345e810f5e
Author: little-cui 
AuthorDate: Mon May 7 15:47:45 2018 +0800

SCB-544 Convenient store extension (#339)

* SCB-544 Convenient store extension

(cherry picked from commit d2dbe7c)

* SCB-544 Convenient store extension
---
 server/broker/broker_suite_test.go |  45 ++
 server/broker/service.go   |   2 +-
 server/broker/service_test.go  |   3 -
 server/broker/store.go | 171 -
 server/core/backend/store/cache_kv.go  |  34 ++--
 server/core/backend/store/cacher.go|   1 +
 server/core/backend/store/common.go|  21 ++-
 server/core/backend/store/{opt.go => config.go}|  52 ---
 server/core/backend/store/event.go |  37 -
 .../backend/store/{event.go => event_proxy.go} |  42 ++---
 server/core/backend/store/extend.go|  84 ++
 .../backend/store/{cacher.go => extend_test.go}|  39 +++--
 server/core/backend/store/indexer.go   |  25 ++-
 server/core/backend/store/listwatch.go |  34 ++--
 server/core/backend/store/store.go |  33 +++-
 server/error/error.go  |  14 +-
 server/rest/controller/rest_util.go|  17 +-
 server/rest/controller/v3/main_controller.go   |  24 ++-
 server/rest/controller/v4/main_controller.go   |  11 +-
 server/service/schema.go   |   1 -
 20 files changed, 353 insertions(+), 337 deletions(-)

diff --git a/server/broker/broker_suite_test.go 
b/server/broker/broker_suite_test.go
new file mode 100644
index 000..8bc652e
--- /dev/null
+++ b/server/broker/broker_suite_test.go
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package broker
+
+import (
+   pb 
"github.com/apache/incubator-servicecomb-service-center/server/core/proto"
+   _ 
"github.com/apache/incubator-servicecomb-service-center/server/plugin/infra/quota/buildin"
+   _ 
"github.com/apache/incubator-servicecomb-service-center/server/plugin/infra/registry/etcd"
+   _ 
"github.com/apache/incubator-servicecomb-service-center/server/plugin/infra/tracing/buildin"
+   _ 
"github.com/apache/incubator-servicecomb-service-center/server/plugin/infra/uuid/buildin"
+   "github.com/apache/incubator-servicecomb-service-center/server/service"
+   . "github.com/onsi/ginkgo"
+   "github.com/onsi/ginkgo/reporters"
+   . "github.com/onsi/gomega"
+   "testing"
+)
+
+var serviceResource pb.ServiceCtrlServer
+var instanceResource pb.SerivceInstanceCtrlServerEx
+var brokerResource = BrokerServiceAPI
+
+var _ = BeforeSuite(func() {
+   //init plugin
+   serviceResource, instanceResource = service.AssembleResources()
+})
+
+func TestBroker(t *testing.T) {
+   RegisterFailHandler(Fail)
+   junitReporter := reporters.NewJUnitReporter("model.junit.xml")
+   RunSpecsWithDefaultAndCustomReporters(t, "model Suite", 
[]Reporter{junitReporter})
+}
diff --git a/server/broker/service.go b/server/broker/service.go
index 3ae63c6..f4ea526 100644
--- a/server/broker/service.go
+++ b/server/broker/service.go
@@ -62,7 +62,7 @@ func (*BrokerService) GetPactsOfProvider(ctx context.Context,
PactLogger.Errorf(nil, "Get pacts of provider failed: %s\n",
resp.Response.Message)
return {
-   Response: pb.CreateResponse(scerr.ErrInvalidParams, 
err.Error()),
+   Response: resp.GetResponse(),
}, err
}
 
diff --git a/server/broker/service_test.go b/server/broker/service_test.go
index 516b8c3..ac910a1 100644
--- a/server/broker/service_test.go
+++