You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2018/03/19 12:07:40 UTC

[incubator-servicecomb-java-chassis] branch master updated (8814a2e -> 4b5ac30)

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git.


    from 8814a2e  SCB-414 fix releaseNotes
     new fc65c5b  SCB-415 change cluster value from "test-cluster" to "default"
     new 4b5ac30  SCB-415 add apollo setting comments

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 samples/config-apollo-sample/src/main/resources/microservice.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

[incubator-servicecomb-java-chassis] 01/02: SCB-415 change cluster value from "test-cluster" to "default"

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit fc65c5ba9c6a0e6be7d54917942bdae93f81efbd
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Mar 19 15:39:41 2018 +0800

    SCB-415 change cluster value from "test-cluster" to "default"
    
    Signed-off-by: zhengyangyong <ya...@huawei.com>
---
 samples/config-apollo-sample/src/main/resources/microservice.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
index 47ef109..549eaa7 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -26,7 +26,7 @@ apollo:
     serverUri: http://127.0.0.1:8070
     serviceName: apollo-test
     env: DEV
-    clusters: test-cluster
+    clusters: default
     namespace: application
     token: #get token from Apollo web pages
 cse:

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

[incubator-servicecomb-java-chassis] 02/02: SCB-415 add apollo setting comments

Posted by ni...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 4b5ac30f8cee272432d64cfbdc04bae63c894f07
Author: zhengyangyong <ya...@huawei.com>
AuthorDate: Mon Mar 19 17:46:38 2018 +0800

    SCB-415 add apollo setting comments
    
    Signed-off-by: zhengyangyong <ya...@huawei.com>
---
 samples/config-apollo-sample/src/main/resources/microservice.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/samples/config-apollo-sample/src/main/resources/microservice.yaml b/samples/config-apollo-sample/src/main/resources/microservice.yaml
index 549eaa7..524b5a5 100644
--- a/samples/config-apollo-sample/src/main/resources/microservice.yaml
+++ b/samples/config-apollo-sample/src/main/resources/microservice.yaml
@@ -24,9 +24,13 @@ service_description:
 apollo:
   config:
     serverUri: http://127.0.0.1:8070
-    serviceName: apollo-test
+    serviceName: apollo-test  #AppId in apollo
     env: DEV
+    #default clusters name in apollo,if user create new clusters please replace this setting value
+    #more detail can be found at https://github.com/ctripcorp/apollo/wiki
     clusters: default
+    #default namespace name in apollo,if user create new namespace please replace this setting value
+    #more detail can be found at https://github.com/ctripcorp/apollo/wiki/Apollo%E6%A0%B8%E5%BF%83%E6%A6%82%E5%BF%B5%E4%B9%8B%E2%80%9CNamespace%E2%80%9D
     namespace: application
     token: #get token from Apollo web pages
 cse:

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