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 b56299c2fd7c5aa40d813deeb6b983d1e8678e3f
Merge: 741a215 f9aea01
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Thu May 17 17:01:56 2018 +0800
Merge branch 'master' into asf-site
_docs/cn/distributed-tracing.md | 2 +-
_docs/cn/flow-control.md | 2 +-
_docs/cn/quick-start-bmi.md | 4 +-
_docs/cn/quick-start-dataconsistency.md | 2 +-
_docs/cn/service-management.md | 2 +-
_docs/distributed-tracing.md | 2 +-
_docs/flow-control.md | 2 +-
_docs/quick-start-bmi.md | 4 +-
_docs/quick-start-dataconsistency.md | 2 +-
_docs/service-management.md | 2 +-
_faqs/cn/faq.md | 2 +-
_faqs/cn/huawei-cloud-faq.md | 4 +-
_faqs/huawei-cloud-faq.md | 6 +-
_posts/2017-06-15-linuxcon-workshop-demo.md | 10 ++--
_posts/2017-07-17-tracing-with-servicecomb.md | 2 +-
_posts/2017-08-21-company-on-kubernetes.md | 2 +-
_posts/cn/2017-06-15-linuxcon-workshop-demo.md | 10 ++--
_posts/cn/2017-07-17-tracing-with-servicecomb.md | 2 +-
.../cn/2017-09-14-maven-dependency-management.md | 7 ---
_users/cn/communicate-protocol.md | 46 +++++++-------
_users/cn/distributed-tracing.md | 3 +-
_users/cn/invoke-control.md | 14 ++---
_users/cn/local-develop-test.md | 2 +-
...nage_springcloud_application_using_sc_and_gs.md | 2 +-
_users/cn/metrics-in-0.5.0.md | 2 +-
_users/cn/metrics-in-1.0.0-m1.md | 4 +-
_users/cn/service-configurations.md | 66 ++++++++++----------
_users/cn/setup-environment.md | 2 +-
_users/cn/use-service-contract.md | 2 +-
_users/cn/use-tls.md | 6 +-
_users/cn/zuul.md | 4 +-
_users/communicate-protocol.md | 46 +++++++-------
_users/distributed-tracing.md | 3 +-
_users/huawei-cloud-faq.md | 6 +-
_users/invoke-control.md | 14 ++---
_users/local-develop-test.md | 2 +-
...nage_springcloud_application_using_sc_and_gs.md | 2 +-
_users/metrics-in-1.0.0-m1.md | 2 +-
_users/service-configurations.md | 70 +++++++++++-----------
_users/setup-environment.md | 2 +-
_users/use-service-contract.md | 2 +-
_users/use-tls.md | 6 +-
_users/zuul.md | 4 +-
43 files changed, 187 insertions(+), 194 deletions(-)
--
To stop receiving notification emails like this one, please contact
ningji...@apache.org.
