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

[ni...@apache.org]

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 3900348d7d556346170d8d5b9fd299cd9fc7e0e5
Merge: d18102f 2d9ee59
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Thu Jan 4 11:25:40 2018 +0800

    Merge branch 'master' into asf-site
    
    Conflicts:
    	_users/Metrics.md

 _data/navigation.yml                               |  13 +-
 _users/cn/Metrics.md                               | 135 --------------
 _users/{Metrics.md => cn/metrics-in-0.5.0.md}      |  19 +-
 _users/cn/metrics-in-1.0.0-m1.md                   | 202 +++++++++++++++++++++
 ...rics-integration-with-prometheus-in-1.0.0-m1.md | 140 ++++++++++++++
 ...-write-file-extension-and-sample-in-1.0.0-m1.md | 173 ++++++++++++++++++
 assets/images/MetricsDependency.png                | Bin 0 -> 10921 bytes
 assets/images/MetricsInGrafana.png                 | Bin 0 -> 35400 bytes
 assets/images/MetricsInPrometheus.png              | Bin 0 -> 60061 bytes
 assets/images/TimeWindowComment.png                | Bin 0 -> 40476 bytes
 10 files changed, 535 insertions(+), 147 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@servicecomb.apache.org" <co...@servicecomb.apache.org>.