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 11372f04f5773cccc75ebf2b2d790dbf267ffd06
Merge: 2464a75 f77cc47
Author: Willem Jiang <jiangni...@huawei.com>
AuthorDate: Sat Apr 7 22:09:07 2018 +0800

    Merge branch 'master' into asf-site

 _users/cn/metrics-in-1.0.0-m1.md                   | 24 +++++++++++++---------
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  2 ++
 _users/edge-in-1.0.0-m1.md                         |  2 +-
 _users/metrics-in-1.0.0-m1.md                      | 24 ++++++++++++++--------
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  7 +++++--
 5 files changed, 37 insertions(+), 22 deletions(-)

diff --cc _users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md
index 315ba99,63fc23b..d0fbfef
mode 100755,100644..100755
--- a/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md
+++ b/_users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md

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

Reply via email to