Commit Graph

2142 Commits (3cb9c9620322c06643d8e2f9c0aac06c2fdb5bac)
 

Author SHA1 Message Date
xiaojing d874592e3f
Merge pull request from fangjian0423/master
Sentinel integration with feign and handle some issues
fangjian0423 54dcd7eaec update sentinel docs
fangjian0423 ac2eee154d Add log configuration for Sentinel
fangjian0423 cd6f79b16b Polish
fangjian0423 0af67df3e3 using sentinel feign in nacos discovery example
fangjian0423 a560774966 Sentinel support feign and close
fangjian0423 b8f608eaa5 Merge remote-tracking branch 'upstream/master'
xiaojing 09aa04eaba
Merge pull request from pbting/master
add a title for end
pbting ff30e58da6 add a title for end
xiaojing d55bc6fcfc
Merge pull request from pbting/master
a solution for custom configure dataid
pbting 1cc2a20d18 update the format
pbting 90804663e5 update the format for document
pbting 4cae318da3 add a solution document fot nacos config shared configuration and custom dataids
xiaojing 5c86086e00
Update nacos-config.adoc
fangjian0423 53643b94ce fixes
xiaojing 0c8bd1b58a
Merge pull request from pbting/master
add nacos configuration metadata
flystar32 eeba7e6aa6 update nacos discovery logic, support both health and enabled
pbting 86bd83af83 add nacos config configuration metadata
xiaojing 4f2eb7487d
Merge pull request from pbting/master
Nacos Config Support multi DataIds
pbting 356ce112a9 code format
pbting 63fd351256 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba
pbting 997c633601
Merge pull request from spring-cloud-incubator/master
同步一次外部代码
pbting 5e5fb2a068 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba
pbting ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接
fangjian0423 25aecfe1ad update docs
fangjian0423 c665e97fb1 remove unuseful logging
fangjian0423 9d59a0e2e5 add apache license for rocketmq binder
xiaojing 473b3da642
Merge pull request from pbting/patch-2
添加新的说明
xiaojing 2d7f15c912
Merge branch 'master' into patch-2
xiaojing 19472f1216
Merge pull request from pbting/master
订正 Nacos Config 的 reference 文档
xiaojing ab92886012
Merge pull request from fangjian0423/master
Refactor binder and update examples
pbting 71522fc027
新增两个配置的说明
1、新增 自定义 namespace 的配置说明
2、新增自定义 Group 的配置说明
pbting d18e5c3a99
Update nacos-config.adoc
fangjian0423 baea051027 update rocketmq example
fangjian0423 7d039f4742 make metrics-core as provided dependency and refactor
fangjian0423 fe17a6c9fb Merge remote-tracking branch 'upstream/master'
format 47b1f05e86
Merge pull request from mercyblitz/master
[Feature] Add Spring Cloud Bus module for Apache RocketMQ
fangjian0423 ac466e0bea Merge remote-tracking branch 'upstream/master'
pbting dd0f4bd6e7
Merge branch 'master' into master
pbting c3c5ed5a1e
Update nacos-config.adoc
xiaojing 855e772f1f
Merge pull request from pbting/patch-1
修正Nacos Config 文档
pbting 19bb1d71c6
Update nacos-config.adoc
pbting 6e85bbf2c1
Update nacos-config.adoc
pbting f7bcedc5db
订正测试代码
订正测试代码
pbting cc965dc2fc
修正文档中的表述
修正文档中的表述
pbting 874515d773
Update nacos-config.adoc
pbting 967705985a
Update nacos-config.adoc
pbting fc4f1dae84
修正Nacos Config 文档
修正Nacos Config 文档
pbting 8d86ddc113
Merge pull request from spring-cloud-incubator/master
同步一次代码操作
xiaojing 5683af3f09
Update README-zh.md