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

[ningjiang]

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 2ebbbc66e3fc6abaca62746b3935d9e206007da7
Merge: 8025633 25154b8
Author: Willem Jiang 
AuthorDate: Wed Nov 7 11:07:48 2018 +0800

Merge branch 'master' into asf-site

 _posts/cn/2018-11-05-talk-to-apache-experts.md | 197 +
 .../apache-developers-gathering-shanghai.jpg   | Bin 0 -> 103875 bytes
 assets/images/servicecomb-wechat-qrcode.jpg| Bin 0 -> 52906 bytes
 3 files changed, 197 insertions(+)

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

[ningjiang]

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 
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(-)

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

[ningjiang]

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 a502adf7c8c9e1e1e3a7cb3cc58ab9a8fa5da416
Merge: 0c5a0d8 60fb14f
Author: Willem Jiang 
AuthorDate: Mon Oct 22 14:05:11 2018 +0800

Merge branch 'master' into asf-site

 assets/images/OSI/OSI-Workshop-1.jpg | Bin 0 -> 1284915 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

[ningjiang]

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 64721eca31da40460b5de6f699c1c3b04a836adb
Merge: e27a531 a342af3
Author: Willem Jiang 
AuthorDate: Tue Oct 9 07:32:07 2018 +0800

Merge branch 'master' into asf-site

 _posts/2018-09-28-Apache-ServiceComb-Meetup-2018-Shanghai.md| 4 +++-
 _posts/cn/2018-09-28-Apache-ServiceComb-Meetup-2018-Shanghai.md | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

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

[ningjiang]

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 44985fe5bcf00defe7c8cc7768b1faf9101528fd
Merge: 77b33c0 f7523f2
Author: Willem Jiang 
AuthorDate: Mon Oct 8 11:38:16 2018 +0800

Merge branch 'master' into asf-site

 _posts/cn/2018-09-28-Apache-ServiceComb-Meetup-2018-Shanghai.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[ningjiang]

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 255cc9ec28e1725df5028b87541a8d367ee36a56
Merge: 73136fd dfbf54f
Author: Willem Jiang 
AuthorDate: Sun Sep 30 01:25:23 2018 -0700

Merge branch 'master' into asf-site

 _posts/2018-09-28-Apache-ServiceComb-Meetup-2018-Shanghai.md | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

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

[ningjiang]

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 096e0c036fbf0782d71620414c9257b01f822786
Merge: 20a71a4 afff1db
Author: Willem Jiang 
AuthorDate: Sun Sep 30 01:15:56 2018 -0700

Merge branch 'master' into asf-site

 _pages/cn/home.md  |  2 +-
 _pages/home.md |  2 +-
 ...9-28-Apache-ServiceComb-Meetup-2018-Shanghai.md | 88 ++
 ...-28-Apache-ServiceComb-Meetup-2018-Shanghai.md} | 16 ++--
 4 files changed, 98 insertions(+), 10 deletions(-)

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

[ningjiang]

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 77e95fc70e503ccfe0bb374478bc05873d848348
Merge: 6de88fd 7a69e8d
Author: Willem Jiang 
AuthorDate: Sat Sep 29 21:49:10 2018 -0700

Merge branch 'master' into asf-site

 .../2018-09-28-huawei-connect-2018-servicecomb.md  | 97 ++
 1 file changed, 97 insertions(+)

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

[ningjiang]

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 ee89cca299600252d3e0f3f3bd55fb36e0450441
Merge: 3257e74 72a0ca4
Author: Willem Jiang 
AuthorDate: Sat Sep 29 07:31:57 2018 -0700

Merge branch 'master' into asf-site

 .../2018-09-28-huawei-connect-2018-servicecomb.md  |  0
 .../2018-10-12-huawei-connect-2018-servicecomb.md  | 97 --
 _posts/cn/2018-8-13-1.0.0-release-note.md  | 12 ++-
 3 files changed, 5 insertions(+), 104 deletions(-)

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

[ningjiang]

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 0efc13bdbd904cb6b033b50ee6d4a48880673538
Merge: 8ad050b 1308030
Author: Willem Jiang 
AuthorDate: Mon Sep 17 14:54:55 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

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

[ningjiang]

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 8f8b381fda5ced1ef36e3e8921dfd95f0325ecb0
Merge: e151484 891ddc2
Author: Willem Jiang 
AuthorDate: Mon Sep 17 12:05:14 2018 +0800

Merge branch 'master' into asf-site

 _includes/masthead.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

[ningjiang]

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 e642d85721ab92104c00144d9572a07b082dead4
Merge: f4d598a 6ef784c
Author: Willem Jiang 
AuthorDate: Mon Sep 3 10:52:39 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml | 92 +---
 1 file changed, 9 insertions(+), 83 deletions(-)

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

[ningjiang]

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 5486ab048e88b08b7559c68603576b1fd1321c38
Merge: f4baa57 c39bf12
Author: Willem Jiang 
AuthorDate: Sun Sep 2 07:42:40 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/team.md | 12 +---
 _developers/team.md| 12 +---
 _pages/cn/home.md  |  4 ++--
 _pages/home.md |  7 ---
 4 files changed, 24 insertions(+), 11 deletions(-)

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

[ningjiang]

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 ea0b31bf2b79671c810408fa7dbbed141a6fb0a7
Merge: ad81a69 a6d4d31
Author: Willem Jiang 
AuthorDate: Tue Aug 28 14:56:43 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/team.md |  43 +-
 _developers/team.md|  39 +-
 ...-05-17-easy-build-microservice-system-part-I.md | 136 
 ...05-23-easy-build-microservice-system-part-II.md | 325 -
 ...6-07-easy-build-microservice-system-part-III.md | 160 -
 ...07-10-easy-build-microservice-system-part-IV.md | 198 --
 _posts/cn/2018-08-28-crm-part-I.md | 747 +
 assets/images/scaffold/OutputHello.png | Bin 17437 -> 19140 bytes
 assets/images/scaffold/StartServiceComb.io.png | Bin 0 -> 75973 bytes
 9 files changed, 791 insertions(+), 857 deletions(-)

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

[ningjiang]

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 49b606e775d8b5c4452bb79beb67a2479a1e0574
Merge: 172b0d5 4fd0e3f
Author: Willem Jiang 
AuthorDate: Mon Aug 27 18:53:33 2018 +0800

Merge branch 'master' into asf-site

 _release/cn/release.md | 16 
 _release/release.md| 16 
 2 files changed, 16 insertions(+), 16 deletions(-)

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

[ningjiang]

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 9b055030ca9c150fc6b5bec063cdaa2fe0a51dce
Merge: 2a1efdd 03cfdbb
Author: Willem Jiang 
AuthorDate: Thu Aug 23 14:34:59 2018 +0800

Merge branch 'master' into asf-site

 _includes/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[ningjiang]

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 66bcb89a8c00dddb15d7657ede356fc763aab02b
Merge: 44bb2b9 830e23d
Author: Willem Jiang 
AuthorDate: Mon Aug 20 18:03:07 2018 +0800

Merge branch 'master' into asf-site

 _pages/home.md |  18 ++
 _posts/2018-8-20-release-note-1-0-0.md | 102 +
 2 files changed, 108 insertions(+), 12 deletions(-)

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

[ningjiang]

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 93648703e99be6950fa064426edb842b9f5f7605
Merge: 81a1cb1 d53697e
Author: Willem Jiang 
AuthorDate: Mon Aug 13 22:41:08 2018 +0800

Merge branch 'master' into asf-site

 _posts/cn/2018-8-13-1.0.0-release-note.md | 137 ++
 1 file changed, 137 insertions(+)

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

[ningjiang]

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 47239d33b15f180f59b1bc82da2bbceed3a58e29
Merge: 550c914 5fac933
Author: Willem Jiang 
AuthorDate: Tue Aug 7 17:05:42 2018 +0800

Merge branch 'master' into asf-site

 _includes/footer.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

[ningjiang]

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 75d8f0eab1341b925e310ce198e09dd32a7e6805
Merge: a8b23a7 e74581e
Author: Willem Jiang 
AuthorDate: Tue Aug 7 10:13:00 2018 +0800

Merge branch 'master' into asf-site

 _includes/footer.html | 1 -
 1 file changed, 1 deletion(-)

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

[ningjiang]

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 1916d07a2e81a9dcc5e1bab7c34da1833ac8a067
Merge: b88ab9d c3588d4
Author: Willem Jiang 
AuthorDate: Thu Aug 2 22:50:02 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   | 2 +-
 _developers/cn/team.md | 1 -
 _pages/cn/home.md  | 4 ++--
 _pages/home.md | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

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

[ningjiang]

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 b7c1bb74598ff3214744f711e6a6f2acee7599df
Merge: 3dee71e 7535dad
Author: Willem Jiang 
AuthorDate: Sat Jul 21 07:57:13 2018 +0800

Merge branch 'master' into asf-site

 _users/cn/setup-environment.md | 10 +-
 _users/setup-environment.md| 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

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

[ningjiang]

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 71a12efee1b066e36f702394b337fa070ed637b7
Merge: c63f205 e525e2e
Author: Willem Jiang 
AuthorDate: Fri Jul 20 07:01:57 2018 +0800

Merge branch 'master' into asf-site

 ...07-10-easy-build-microservice-system-part-IV.md | 198 +
 assets/images/scaffold/AuthSuccess.png | Bin 0 -> 100204 bytes
 assets/images/scaffold/EdgeAuth.png| Bin 0 -> 31684 bytes
 assets/images/scaffold/ErrorAuthHeader.png | Bin 0 -> 106784 bytes
 assets/images/scaffold/FilterChain.png | Bin 0 -> 22932 bytes
 assets/images/scaffold/LoginFirst.png  | Bin 0 -> 108269 bytes
 assets/images/scaffold/NoAuthHeader.png| Bin 0 -> 104790 bytes
 7 files changed, 198 insertions(+)

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

[ningjiang]

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 7be09605319ca97434d03c6ed36dc33fbbec83d0
Merge: 732ac17 2e60a5b
Author: Willem Jiang 
AuthorDate: Wed Jul 4 17:41:27 2018 +0800

Merge branch 'master' into asf-site

 _pages/cn/security.md | 2 ++
 1 file changed, 2 insertions(+)

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

[ningjiang]

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 78de2623ecc53e37accc594fd5dd8aaf6843d6bc
Merge: 1f33540 f827b29
Author: Willem Jiang 
AuthorDate: Wed Jul 4 17:32:34 2018 +0800

Merge branch 'master' into asf-site

 _includes/footer.html |  2 +-
 _pages/cn/security.md | 13 +
 _pages/security.md| 13 +
 3 files changed, 27 insertions(+), 1 deletion(-)

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

[ningjiang]

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 570270c6093613f1746f7734f3b84cd51f48e540
Merge: 2a007ff e0bb397
Author: Willem Jiang 
AuthorDate: Sun Jun 24 09:02:06 2018 +0800

Merge branch 'master' into asf-site

 _pages/cn/home.md | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

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

[ningjiang]

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 07b054988ffb953dc978c8a17e78ef0023ce
Merge: 0e78e2b 65182f1
Author: Willem Jiang 
AuthorDate: Sun Jun 24 08:43:09 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/team.md | 5 +++--
 _developers/team.md| 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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

[ningjiang]

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 bfe839537a016bafb0a1e5e47b50f481e74d7f98
Merge: d4e8552 5f16dc9
Author: Willem Jiang 
AuthorDate: Wed Jun 20 15:41:37 2018 +0800

Merge branch 'master' into asf-site

 _users/cn/service-configurations.md | 8 +---
 _users/service-configurations.md| 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

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

[ningjiang]

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 7f27fdb087287c076f6f3a32e6b063f304ebd0f9
Merge: a38f90d 1dbd850
Author: Willem Jiang 
AuthorDate: Tue Jun 19 14:33:52 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml|  4 
 _data/ui-text.yml   |  2 ++
 _developers/becomming-a-committer.md| 31 +++
 _developers/cn/becomming-a-committer.md | 31 +++
 _includes/footer.html   |  1 +
 5 files changed, 69 insertions(+)

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

[ningjiang]

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 91cc0d7a6bbb791db418f7126e6d9f6ff8e6c732
Merge: cc2272b c040359
Author: Willem Jiang 
AuthorDate: Thu Jun 14 14:15:35 2018 +0800

Merge branch 'master' into asf-site

 _pages/cn/home.md  |   2 +-
 _pages/home.md |   2 +-
 ...018-06-14-apache-servicecomb-incubating-day.md} | 111 -
 ...2018-05-23-apache-servicecomb-incubating-day.md |  70 ---
 ...2018-06-14-apache-servicecomb-incubating-day.md | 131 +
 5 files changed, 216 insertions(+), 100 deletions(-)

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

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

[ningjiang]

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 a06e03a36a2c7a5ff37a4fb3bd67bb87f26350d6
Merge: dfaae64 cba67d1
Author: Willem Jiang 
AuthorDate: Mon Jun 11 11:57:22 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/team.md | 3 ++-
 _developers/team.md| 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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

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

[ningjiang]

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 3c19e85d81c7b3f8d0c87f7ba247b84f3307c7be
Merge: 14683ed ad59bd0
Author: Willem Jiang 
AuthorDate: Wed Jun 6 17:48:49 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/team.md | 31 ---
 _developers/team.md| 32 +---
 2 files changed, 33 insertions(+), 30 deletions(-)

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

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

[ningjiang]

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 037abf2428f2a42c3a95edd9c0d7760f9172d88e
Merge: a7b3170 dd0c665
Author: Willem Jiang 
AuthorDate: Tue Jun 5 16:39:06 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |  4 
 _developers/cn/team.md | 54 +
 _developers/team.md| 55 ++
 3 files changed, 113 insertions(+)


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

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

[ningjiang]

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 7d6cc1a79b5c38c634a09d8c62317e87bd4750b2
Merge: 3292f81 f395a75
Author: Willem Jiang 
AuthorDate: Wed May 30 20:30:00 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |  2 +-
 _developers/cn/contributing.md | 61 +-
 _developers/contributing.md|  2 +-
 3 files changed, 32 insertions(+), 33 deletions(-)


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

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

[ningjiang]

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 f79d7ba50a5f857c05cdfa52eaba74119d17eef2
Merge: d4b2b6b 8c12ac9
Author: Willem Jiang 
AuthorDate: Mon May 28 17:43:05 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml|   2 +
 _users/cn/deploy-mode.md| 337 
 assets/images/DockerDeployment.png  | Bin 0 -> 68208 bytes
 assets/images/DockerPackageAssembly.png | Bin 0 -> 79706 bytes
 assets/images/K8S.png   | Bin 0 -> 150042 bytes
 assets/images/ServiceCombBasic.png  | Bin 0 -> 9778 bytes
 assets/images/ServiceCombInK8S.png  | Bin 0 -> 172082 bytes
 assets/images/SimpleDeployment.png  | Bin 0 -> 19863 bytes
 8 files changed, 339 insertions(+)


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

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

[ningjiang]

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 646f045ac24dd8595381d8c2b207f110472b99ac
Merge: c1356f3 4589a64
Author: Willem Jiang 
AuthorDate: Thu May 24 14:49:49 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |   4 +
 _developers/release_guide.md   |  93 +++---
 _pages/cn/home.md  |   7 +-
 _pages/home.md |   7 +-
 ...2018-05-23-apache-servicecomb-incubating-day.md | 101 +++
 ...2018-05-23-apache-servicecomb-incubating-day.md |  70 +
 ...05-23-easy-build-microservice-system-part-II.md | 325 +
 _users/cn/healthcheck.md   |  84 ++
 _users/healthcheck.md  |  84 ++
 assets/images/HealthCheck.png  | Bin 0 -> 27349 bytes
 assets/images/scaffold/ACL.png | Bin 0 -> 88182 bytes
 assets/images/scaffold/RBAC.png| Bin 0 -> 59287 bytes
 assets/images/scaffold/TestLogin.png   | Bin 0 -> 98681 bytes
 assets/images/scaffold/TestLogon.png   | Bin 0 -> 88931 bytes
 assets/images/scaffold/UserServiceInit.png | Bin 0 -> 102862 bytes
 15 files changed, 727 insertions(+), 48 deletions(-)

diff --cc _data/navigation.yml
index 8ae6bc5,88c47ee..548179f
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@@ -270,8 -272,10 +272,10 @@@ t
  url: /cn/users/metrics-in-1.0.0-m1/
- title: 1.0.0-m1版本写文件扩展和示例
  url: 
/cn/users/metrics-write-file-extension-and-sample-in-1.0.0-m1/
 -  - title: 1.0.0-m1版本中的监控如何集成普罗米修斯
 +  - title: 1.0.0-m1版本中的监控如何集成prometheus
  url: /cn/users/metrics-integration-with-prometheus-in-1.0.0-m1/
+   - title: 健康检查
+ url: /cn/users/healthcheck/
  
- title: 部署
  children:

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

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

[ningjiang]

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 d6c725ec276dd08e4289a0025d712627613689fe
Merge: 80fee82 02fcf80
Author: Willem Jiang 
AuthorDate: Mon May 21 17:58:22 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/contributing.md | 2 +-
 _developers/contributing.md| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

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

[ningjiang]

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 089f8c746d6c49c0c6d709812b8b8d9cfdf93872
Merge: fd83044 7e1ed7c
Author: Willem Jiang 
AuthorDate: Mon May 21 17:50:54 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |   4 +
 _developers/cn/contributing.md |  49 
 _developers/contributing.md|  50 
 ...-05-17-easy-build-microservice-system-part-I.md |  87 ++---
 assets/images/scaffold/ArchetypeProjects.png   | Bin 0 -> 105537 bytes
 assets/images/scaffold/BoundedContext.png  | Bin 0 -> 81453 bytes
 assets/images/scaffold/EventStorming.png   | Bin 634632 -> 28699 bytes
 assets/images/scaffold/MicroserviceDesign1.png | Bin 0 -> 2999 bytes
 assets/images/scaffold/MicroserviceDesign2.png | Bin 0 -> 6771 bytes
 assets/images/scaffold/MicroserviceDesign3.png | Bin 0 -> 16885 bytes
 assets/images/scaffold/MicroserviceDesign4.png | Bin 0 -> 22324 bytes
 11 files changed, 161 insertions(+), 29 deletions(-)


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

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

[ningjiang]

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 
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.

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

[ningjiang]

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 459de3d52e65921f7b7866d1a9eac94dad26cd68
Merge: 51f9ab1 80c2a61
Author: Willem Jiang 
AuthorDate: Tue May 8 14:00:42 2018 +0800

Merge branch 'master' into asf-site

 _developers/cn/developer-guide.md|  1 +
 _developers/cn/setup-committer-rights.md | 54 
 _developers/developer-guide.md   |  1 +
 _release/cn/java_chassis_downloads.md| 21 ++---
 _release/cn/saga_downloads.md| 23 +++---
 _release/cn/service_center_downloads.md  | 23 +++---
 6 files changed, 61 insertions(+), 62 deletions(-)

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

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

[ningjiang]

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 161bca488a33b24a29823a8f74626e478164f3e9
Merge: 5483f30 2c4bcb8
Author: Willem Jiang 
AuthorDate: Mon May 7 10:42:34 2018 +0800

Merge branch 'master' into asf-site

 _developers/release_guide.md | 92 +++-
 _faqs/cn/faq.md  | 28 ++---
 _users/cn/develop-with-jax-rs.md |  4 ++
 _users/cn/develop-with-springboot-starter.md |  4 ++
 _users/cn/develop-with-springmvc.md  |  4 ++
 _users/cn/develop-with-transparent-rpc.md| 15 -
 _users/develop-with-jax-rs.md|  4 ++
 _users/develop-with-springboot-starter.md|  4 ++
 _users/develop-with-springmvc.md |  4 ++
 _users/develop-with-transparent-rpc.md   | 15 -
 10 files changed, 134 insertions(+), 40 deletions(-)

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

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

[ningjiang]

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 925965e59211c44b1c33d8f3ebd00825f0cb4e7f
Merge: 17f45a3 676ae04
Author: Willem Jiang 
AuthorDate: Tue Apr 24 17:33:16 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |  14 +-
 _faqs/cn/faq.md|   4 +
 _users/cn/develop-with-springboot-starter.md   | 147 +
 ...age_springcloud_application_using_sc_and_gs.md} | 106 ++-
 _users/develop-with-jax-rs.md  |   4 +-
 ...ngmvc.md => develop-with-springboot-starter.md} |  92 ++---
 _users/develop-with-springmvc.md   |   4 +-
 _users/develop-with-transparent-rpc.md |   4 +-
 ...age_springcloud_application_using_sc_and_gs.md} | 100 ++
 9 files changed, 230 insertions(+), 245 deletions(-)


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

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

[ningjiang]

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 1140e8ddee60004c6ea38588ed3fef4ad86509ac
Merge: f6f834d 7a11a2e
Author: Willem Jiang 
AuthorDate: Tue Apr 24 11:28:03 2018 +0800

Merge branch 'master' into asf-site

 _pages/cn/about-slides.md | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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

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

[ningjiang]

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 39ec220eff1b05d2e1e6b1ddb1d7d5928ca3d81c
Merge: 8651606 608a2d7
Author: Willem Jiang 
AuthorDate: Mon Apr 23 10:39:54 2018 +0800

Merge branch 'master' into asf-site

 _pages/about-slides.md|  13 +++--
 assets/slides/20180322/ServiceComb-OSCAR.pdf  | Bin 0 -> 4192319 bytes
 .../slides/20180421/Introduction_to_ServiceComb.pdf   | Bin 0 -> 684862 bytes
 assets/slides/20180422/QConBeijing2018-Saga.pdf   | Bin 0 -> 2912841 bytes
 4 files changed, 11 insertions(+), 2 deletions(-)

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

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

[ningjiang]

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 5fc130a96c4ab8935501f05da43a20299936c765
Merge: 3465aac b1431cd
Author: Willem Jiang 
AuthorDate: Tue Apr 17 17:41:54 2018 +0800

Merge branch 'master' into asf-site

 _docs/cn/quick-start.md | 2 +-
 _docs/quick-start.md| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

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

[ningjiang]

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 ce2246eb87f4b6465a99e9b7d73d7116f4fb97c3
Merge: 02d3895 7034419
Author: Willem Jiang 
AuthorDate: Fri Apr 13 16:10:53 2018 +0800

Merge branch 'master' into asf-site

 _users/cn/setup-environment.md | 130 +++-
 _users/setup-environment.md| 133 +++--
 2 files changed, 255 insertions(+), 8 deletions(-)

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

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

[ningjiang]

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 6117132e40d32eb05f05d3bca00eab1a2b124de4
Merge: 33072f9 37ff16f
Author: Willem Jiang 
AuthorDate: Mon Apr 9 14:42:01 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml|   4 +
 _developers/cn/release_guide.md | 233 
 _developers/release_guide.md| 233 
 3 files changed, 470 insertions(+)


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

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

[ningjiang]

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 11372f04f577375ebf2b2d790dbf267ffd06
Merge: 2464a75 f77cc47
Author: Willem Jiang 
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.

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

[ningjiang]

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 2f3555dd4a0a3008f41da679f175303296be8704
Merge: b8d7d78 8536896
Author: Willem Jiang 
AuthorDate: Mon Apr 2 22:32:41 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |  8 +++---
 _release/cn/java_chassis_downloads.md  | 39 +++-
 _release/cn/saga_binaries.md   | 37 +++
 _release/cn/saga_downloads.md  | 37 +++
 _release/cn/service_center_binaries.md | 37 ++-
 _release/cn/service_center_downloads.md| 37 ++-
 _release/cn/service_center_releaseNotes.md |  2 +-
 _release/java_chassis_downloads.md | 41 +-
 _release/saga_binaries.md  | 37 +++
 _release/saga_downloads.md | 37 +++
 _release/service_center_binaries.md| 36 ++
 _release/service_center_downloads.md   | 38 ++-
 _release/service_center_releaseNotes.md|  2 +-
 13 files changed, 377 insertions(+), 11 deletions(-)


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

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

[ningjiang]

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 7acceebeb32335eca84262f4c3a507813c0e0374
Merge: 429d351 00515a5
Author: Willem Jiang 
AuthorDate: Mon Apr 2 20:29:23 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml| 12 ++--
 _pages/cn/home.md   |  5 -
 _pages/home.md  |  5 -
 _release/cn/java_chassis_binaries.md| 12 
 _release/cn/java_chassis_downloads.md   | 14 ++
 _release/cn/release.md  |  2 ++
 _release/cn/saga_downloads.md   |  4 ++--
 _release/cn/service_center_downloads.md |  4 ++--
 _release/java_chassis_binaries.md   | 12 
 _release/java_chassis_downloads.md  | 14 ++
 _release/release.md |  2 ++
 _release/saga_downloads.md  |  4 ++--
 _release/service_center_downloads.md|  4 ++--
 13 files changed, 54 insertions(+), 40 deletions(-)


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

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

[ningjiang]

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 677e43b83866b295259edd30a0eeab9a0d3b3f60
Merge: 737b25a 4f41cd0
Author: Willem Jiang 
AuthorDate: Fri Mar 30 22:24:18 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml|  6 +++---
 _release/cn/release.md  | 37 +
 _release/cn/saga_binaries.md|  4 +++-
 _release/cn/saga_downloads.md   | 14 +
 _release/cn/service_center_binaries.md  |  5 -
 _release/cn/service_center_downloads.md | 16 ++
 _release/release.md | 37 +
 _release/saga_binaries.md   |  4 +++-
 _release/saga_downloads.md  | 14 +
 _release/service_center_binaries.md |  5 -
 _release/service_center_downloads.md| 15 +
 11 files changed, 150 insertions(+), 7 deletions(-)


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

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

[ningjiang]

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 e5788e9fadfd1d7f47497ff954b715794340fd8a
Merge: 1ad30b3 996b7a6
Author: Willem Jiang 
AuthorDate: Thu Mar 29 14:45:17 2018 +0800

Merge branch 'master' into asf-site

 _release/cn/java_chassis_binaries.md   | 2 +-
 _release/cn/release.md | 6 ++
 _release/cn/saga_binaries.md   | 2 +-
 _release/cn/service_center_binaries.md | 3 ++-
 _release/java_chassis_binaries.md  | 2 +-
 _release/release.md| 4 ++--
 _release/saga_binaries.md  | 2 +-
 _release/service_center_binaries.md| 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

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

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

[ningjiang]

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 f1a39b77d05f1c504a5b9cbcc34c14a559696121
Merge: d061cf5 4613e24
Author: Willem Jiang 
AuthorDate: Mon Jan 22 16:51:28 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |   6 ++
 _users/cn/dynamic-config.md| 109 +
 _users/dynamic-config.md   | 108 
 assets/images/config/create_project.png| Bin 0 -> 17864 bytes
 assets/images/config/create_project2.png   | Bin 0 -> 17322 bytes
 assets/images/config/login.png | Bin 0 -> 11412 bytes
 assets/images/config/release_config.png| Bin 0 -> 46912 bytes
 assets/images/config/release_namespace.png | Bin 0 -> 44073 bytes
 assets/images/config/token.png | Bin 0 -> 26020 bytes
 9 files changed, 223 insertions(+)

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

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

[ningjiang]

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 8425a64e6e8c7bdafc78eb53711b240bc4367ee9
Merge: c3be50d c6777e6
Author: Willem Jiang 
AuthorDate: Fri Jan 12 17:44:04 2018 +0800

Merge branch 'master' into asf-site

 _data/authors.yml  |   5 +
 _data/navigation.yml   |   7 +
 _pages/about-slides.md |   3 +
 _pages/cn/about-slides.md  |   3 +
 _posts/2018-01-10-howto-upgrade-to-zipkin-v2.md| 238 +
 _users/cn/metrics-in-1.0.0-m1.md   | 118 +-
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  12 +-
 ...-write-file-extension-and-sample-in-1.0.0-m1.md | 124 +++
 _users/metrics-in-1.0.0-m1.md  | 208 ++
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  73 ---
 .../20180111/ServiceComb_Metrics_Introduction.pdf  | Bin 0 -> 961428 bytes
 11 files changed, 595 insertions(+), 196 deletions(-)

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

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

[ningjiang]

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 
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" .

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

[ningjiang]

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 b84cb72f4504c83a3d15fc19e8489ef3936104a3
Merge: 9de9ac9 3b1fb59
Author: Willem Jiang 
AuthorDate: Fri Dec 29 18:39:03 2017 +0800

Merge branch 'master' into asf-site

 _developers/setup-develop-environment.md | 63 +--
 _developers/submit-codes.md  | 88 +++-
 2 files changed, 77 insertions(+), 74 deletions(-)

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