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 6165237f7629c6e2490af912df8d152658fa1de6
Merge: f654f02 3d1b820
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Fri Nov 2 18:16:23 2018 +0800
Merge branch 'master' into asf-site
.../cn/2018-09-11-loadtest-saga-with-kubernetes.md | 160 +++++++++++++++++++++
_posts/cn/2018-10-15-OSI-Workshop-Report.md | 2 +-
assets/images/OSI/OSI-Tracks.png | Bin 165029 -> 0 bytes
assets/images/OSI/Patners.png | Bin 116394 -> 0 bytes
assets/images/OSI/Speakers.jpg | Bin 2886295 -> 0 bytes
assets/images/hybrid-arch.jpg | Bin 0 -> 22772 bytes
assets/images/hybrid-consumer-result.png | Bin 0 -> 13916 bytes
assets/images/hybrid-mesher-process.jpg | Bin 0 -> 17217 bytes
assets/images/hybrid-servicecenter-result.png | Bin 0 -> 49970 bytes
assets/images/hybrid-sidecar-injector.jpg | Bin 0 -> 19811 bytes
assets/images/jmeter-collector.png | Bin 0 -> 55774 bytes
assets/images/spring-demo.jpg | Bin 0 -> 25204 bytes
12 files changed, 161 insertions(+), 1 deletion(-)
