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/servicecomb-website.git
commit e246dd94a4bfb52efa697ad78b47db7e2f93ab35
Merge: 9a67a3a 00515d6
Author: Willem Jiang <willem.ji...@gmail.com>
AuthorDate: Wed Aug 14 22:33:21 2019 +0800
Merge branch 'master' into asf-site
_docs/cn/mersher-distributed-tracing.md | 10 +-
_docs/cn/mersher-flow-control.md | 4 +-
_docs/cn/mersher-load-balance.md | 29 +++++-
_docs/cn/mersher-quick-start.md | 114 ++++++++++-----------
_docs/cn/mersher-service-management.md | 32 +++---
_docs/mersher-distributed-tracing.md | 10 +-
_docs/mersher-flow-control.md | 4 +-
_docs/mersher-load-balance.md | 25 ++++-
_docs/mersher-quick-start.md | 112 +++++++++-----------
_docs/mersher-service-management.md | 36 ++++---
.../mersher/mersher-circuitbreaker-ret-nil.png | Bin 0 -> 7302 bytes
.../images/mersher/mersher-circuitbreaker-ret.png | Bin 5972 -> 9028 bytes
assets/images/mersher/mersher-circuitbreaker.png | Bin 15220 -> 30583 bytes
.../images/mersher/mersher-deployment-simple.png | Bin 0 -> 51664 bytes
.../images/mersher/mersher-flow-control-fail.png | Bin 26430 -> 6958 bytes
assets/images/mersher/mersher-flowchart-simple.png | Bin 0 -> 23925 bytes
assets/images/mersher/mersher-ser-manage-ver.png | Bin 5934 -> 16442 bytes
assets/images/mersher/mersher-servercenter.png | Bin 31799 -> 28075 bytes
assets/images/mersher/mersher-testinit.png | Bin 29517 -> 30550 bytes
assets/images/mersher/mersher-testpythonhttp2.png | Bin 0 -> 31215 bytes
assets/images/mersher/mersher-tracing-30111.png | Bin 42725 -> 48084 bytes
21 files changed, 198 insertions(+), 178 deletions(-)
