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

2018-08-19 Thread 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 2fa73cc906b0c5e5cf1ce79138b1ef90929358dc
Merge: 6c6887a db91880
Author: Willem Jiang 
AuthorDate: Mon Aug 20 11:02:59 2018 +0800

Merge branch 'master' into asf-site

 _pages/cn/home.md | 14 --
 _posts/cn/2018-8-13-1.0.0-release-note.md | 15 ++-
 2 files changed, 18 insertions(+), 11 deletions(-)

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

2018-08-07 Thread 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 bee3a3ed4a75e81118d9513508d09e679d9b
Merge: 7752ffe 6cc0a65
Author: Willem Jiang 
AuthorDate: Tue Aug 7 14:19:29 2018 +0800

Merge branch 'master' into asf-site

 _data/ui-text.yml | 2 +-
 _includes/footer.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

2018-07-12 Thread 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 246c2babc24681238fc4543757e4fb84da3b4270
Merge: 8abaa74 043a8ba
Author: Willem Jiang 
AuthorDate: Thu Jul 12 20:46:34 2018 +0800

Merge branch 'master' into asf-site

 ...6-07-easy-build-microservice-system-part-III.md | 160 +
 _users/service-heartbeat.md|   2 +-
 assets/images/scaffold/DirectInvoke.png| Bin 0 -> 7713 bytes
 .../scaffold/EdgeOnlySupportConsumerHandler.png| Bin 0 -> 14500 bytes
 assets/images/scaffold/InvokeViaEdge.png   | Bin 0 -> 19978 bytes
 assets/images/scaffold/LoginViaEdge.png| Bin 0 -> 108503 bytes
 assets/images/scaffold/LogonViaEdge.png| Bin 0 -> 99103 bytes
 assets/images/scaffold/PerformanceTestDeploy.png   | Bin 0 -> 9400 bytes
 8 files changed, 161 insertions(+), 1 deletion(-)

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

2018-04-04 Thread 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 e0d10fb50a30fb0dcf93234e90f07b62744e95e1
Merge: 36d1ab3 da90d48
Author: Willem Jiang 
AuthorDate: Wed Apr 4 15:52:01 2018 +0800

Merge branch 'master' into asf-site

 _data/navigation.yml   |   6 +-
 _docs/cn/distributed-tracing.md|   4 +-
 _docs/cn/flow-control.md   |   2 +-
 _docs/cn/quick-start-bmi.md|  12 +-
 _docs/cn/quick-start-dataconsistency.md|   2 +-
 _docs/cn/service-management.md |   2 +-
 _docs/distributed-tracing.md   |   4 +-
 _docs/flow-control.md  |   2 +-
 _docs/quick-start-bmi.md   |  12 +-
 _docs/quick-start-dataconsistency.md   |   2 +-
 _docs/service-management.md|   2 +-
 _faqs/cn/faq.md|   6 +-
 _faqs/faq.md   |   4 +-
 _posts/2017-06-15-linuxcon-workshop-demo.md|   4 +-
 _posts/2017-07-17-tracing-with-servicecomb.md  |   4 +-
 _posts/2018-01-10-howto-upgrade-to-zipkin-v2.md|  12 +-
 _posts/cn/2017-06-15-linuxcon-workshop-demo.md |   4 +-
 _posts/cn/2017-07-17-tracing-with-servicecomb.md   |   4 +-
 .../cn/2017-09-14-maven-dependency-management.md   |   8 +-
 _users/application-boot-process.md |   2 +-
 _users/cn/application-boot-process.md  |   2 +-
 _users/cn/communicate-protocol.md  |  16 +-
 _users/cn/customized-tracing.md|   4 +-
 _users/cn/define-service-contract.md   |   2 +-
 _users/cn/deployment.md|  10 +-
 _users/cn/develop-with-jax-rs.md   |   8 +-
 _users/cn/develop-with-rest-template.md|   8 +-
 _users/cn/develop-with-rpc.md  |  10 +-
 _users/cn/develop-with-springmvc.md|   8 +-
 _users/cn/develop-with-transparent-rpc.md  |  10 +-
 _users/cn/distributed-tracing.md   |   4 +-
 _users/cn/metrics-in-1.0.0-m1.md   | 259 ++---
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  75 +++---
 ...-write-file-extension-and-sample-in-1.0.0-m1.md |   6 +-
 _users/cn/service-configurations.md|   8 +-
 _users/cn/service-definition.md|   4 +-
 _users/cn/service-heartbeat.md |   2 +-
 _users/cn/setup-environment.md |  10 +-
 _users/cn/use-servicecomb-in-spring-boot.md|   4 +-
 _users/cn/use-tls.md   |   4 +-
 _users/cn/zuul.md  |   2 +-
 _users/communicate-protocol.md |  16 +-
 _users/customized-tracing.md   |   4 +-
 _users/define-service-contract.md  |   2 +-
 _users/deployment.md   |  10 +-
 _users/develop-with-jax-rs.md  |   8 +-
 _users/develop-with-rest-template.md   |   8 +-
 _users/develop-with-rpc.md |  10 +-
 _users/develop-with-springmvc.md   |   8 +-
 _users/develop-with-transparent-rpc.md |  10 +-
 _users/distributed-tracing.md  |   4 +-
 _users/edge-in-1.0.0-m1.md |  99 
 _users/faq.md  |   4 +-
 _users/metrics-in-1.0.0-m1.md  | 248 +---
 ...rics-integration-with-prometheus-in-1.0.0-m1.md |  73 +++---
 _users/service-configurations.md   |   8 +-
 _users/service-definition.md   |   4 +-
 _users/service-heartbeat.md|   2 +-
 _users/setup-environment.md|  16 +-
 _users/use-servicecomb-in-spring-boot.md   |   6 +-
 _users/use-tls.md  |   4 +-
 _users/zuul.md |   2 +-
 assets/images/MetricsDependency.png| Bin 10921 -> 10323 bytes
 assets/images/MetricsInGrafana.png | Bin 35400 -> 108063 bytes
 assets/images/MetricsInPrometheus.png  | Bin 60061 -> 47642 bytes
 assets/images/MetricsWriteFileResult.png   | Bin 59021 -> 74432 bytes
 66 files changed, 659 insertions(+), 441 deletions(-)

diff --cc _users/cn/metrics-integration-with-prometheus-in-1.0.0-m1.md
index 1781eb2,b5100dc..315ba99
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
@@@ -35,54 -35,9 +35,9 @@@ Prometheus推荐Pull模式拉取Metrics

  ```

[incubator-servicecomb-website] 01/01: Merge branch 'master' into asf-site for updating the document.

2017-12-24 Thread 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 7176b2c3ed6bd460a0b62763ad0b887aaa27f40c
Merge: 480e60e 36ba901
Author: Willem Jiang 
AuthorDate: Mon Dec 25 10:17:00 2017 +0800

Merge branch 'master' into asf-site for updating the document.

 _developers/cn/submit-codes.md   |  20 ++--
 _developers/submit-codes.md  |  20 ++--
 _users/application-boot-process.md   |  22 ++---
 _users/cn/deployment.md  |   2 +
 _users/communicate-protocol.md   | 150 ++--
 _users/customized-tracing.md |  54 +--
 _users/define-service-contract.md|  62 ++--
 _users/deployment.md |  44 +
 _users/develop-with-jax-rs.md|  70 ++
 _users/develop-with-rest-template.md |  22 ++---
 _users/develop-with-rpc.md   |  14 +--
 _users/develop-with-springmvc.md |  64 ++--
 _users/develop-with-transparent-rpc.md   |  52 +-
 _users/distributed-tracing.md|  34 +++
 _users/invoke-control.md |  61 ++--
 _users/local-develop-test.md |  40 
 _users/nginx.md  |  64 ++--
 _users/service-configurations.md | 161 ---
 _users/service-definition.md |  56 +--
 _users/service-heartbeat.md  |  20 ++--
 _users/service-interface-constraints.md  |  50 +-
 _users/servicecomb-introduction.md   |  42 
 _users/setup-environment.md  |  40 
 _users/use-service-contract.md   |  48 +
 _users/use-servicecomb-in-spring-boot.md | 102 ++--
 _users/use-tls.md| 136 +-
 _users/zuul.md   | 102 ++--
 assets/images/local_develop_test_en.png  | Bin 0 -> 20494 bytes
 assets/images/servicecomb_mode_en.png| Bin 0 -> 33217 bytes
 assets/images/thread-model-en.png| Bin 0 -> 28527 bytes
 30 files changed, 775 insertions(+), 777 deletions(-)

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