1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

Commit Graph

  • 0c8bd1b58a
    Merge pull request #137 from pbting/master xiaojing 2018-12-05 10:27:23 +08:00
  • e812515250
    Merge pull request #136 from pbting/1.x xiaojing 2018-12-05 10:24:42 +08:00
  • bee06af41c update nacos discovery logic, support both health and enabled flystar32 2018-12-04 15:07:01 +08:00
  • eeba7e6aa6 update nacos discovery logic, support both health and enabled flystar32 2018-12-04 15:02:26 +08:00
  • 4e76fbe773 modify the metadata of type and defaultValue for spring cloud cloud nacos config pbting 2018-12-04 14:30:58 +08:00
  • 86bd83af83 add nacos config configuration metadata pbting 2018-12-04 14:29:01 +08:00
  • 46570f8ce3 nacos config support custom config dataid and group pbting 2018-12-04 14:12:54 +08:00
  • 4f2eb7487d
    Merge pull request #135 from pbting/master xiaojing 2018-12-04 10:51:18 +08:00
  • 356ce112a9 code format pbting 2018-12-04 10:37:57 +08:00
  • 63fd351256 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba pbting 2018-12-04 10:02:52 +08:00
  • 997c633601
    Merge pull request #4 from spring-cloud-incubator/master pbting 2018-12-04 10:02:17 +08:00
  • 5e5fb2a068 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba pbting 2018-12-04 10:00:14 +08:00
  • ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 pbting 2018-12-04 09:59:55 +08:00
  • 25aecfe1ad update docs fangjian0423 2018-11-30 16:47:19 +08:00
  • c665e97fb1 remove unuseful logging fangjian0423 2018-11-30 16:46:59 +08:00
  • 9d59a0e2e5 add apache license for rocketmq binder fangjian0423 2018-11-29 14:30:36 +08:00
  • 51e9ae552a
    Merge pull request #129 from fangjian0423/1.x xiaojing 2018-11-29 14:14:14 +08:00
  • e21d79b5d7 update rocketmq example readme fangjian0423 2018-11-29 14:05:28 +08:00
  • ba9bbd6ab6 magic value refactor for 1.x fangjian0423 2018-11-29 11:23:04 +08:00
  • 08b1c3ab45 Merge remote-tracking branch 'upstream/1.x' into 1.x fangjian0423 2018-11-29 11:18:15 +08:00
  • 3e2564bdec update rocketmq exmaple for 1.x branch fangjian0423 2018-11-29 11:17:41 +08:00
  • 2c7ab714fb make metrics-core as provided dependency and refactor for 1.x branch fangjian0423 2018-11-29 11:17:08 +08:00
  • 473b3da642
    Merge pull request #127 from pbting/patch-2 xiaojing 2018-11-29 11:04:57 +08:00
  • 2d7f15c912
    Merge branch 'master' into patch-2 xiaojing 2018-11-29 11:04:49 +08:00
  • 19472f1216
    Merge pull request #126 from pbting/master xiaojing 2018-11-29 11:03:41 +08:00
  • ab92886012
    Merge pull request #128 from fangjian0423/master xiaojing 2018-11-29 11:03:23 +08:00
  • 71522fc027
    新增两个配置的说明 pbting 2018-11-28 17:21:19 +08:00
  • d18e5c3a99
    Update nacos-config.adoc pbting 2018-11-28 17:17:22 +08:00
  • baea051027 update rocketmq example fangjian0423 2018-11-28 17:14:25 +08:00
  • 7d039f4742 make metrics-core as provided dependency and refactor fangjian0423 2018-11-28 17:13:59 +08:00
  • fe17a6c9fb Merge remote-tracking branch 'upstream/master' fangjian0423 2018-11-28 15:32:52 +08:00
  • 47b1f05e86
    Merge pull request #119 from mercyblitz/master format 2018-11-28 15:27:27 +08:00
  • ac466e0bea Merge remote-tracking branch 'upstream/master' fangjian0423 2018-11-28 15:16:11 +08:00
  • dd0f4bd6e7
    Merge branch 'master' into master pbting 2018-11-28 14:45:37 +08:00
  • c3c5ed5a1e
    Update nacos-config.adoc pbting 2018-11-28 14:39:31 +08:00
  • 855e772f1f
    Merge pull request #124 from pbting/patch-1 xiaojing 2018-11-28 14:30:23 +08:00
  • 19bb1d71c6
    Update nacos-config.adoc pbting 2018-11-28 11:26:03 +08:00
  • 6e85bbf2c1
    Update nacos-config.adoc pbting 2018-11-27 23:04:32 +08:00
  • f7bcedc5db
    订正测试代码 pbting 2018-11-27 23:03:08 +08:00
  • cc965dc2fc
    修正文档中的表述 pbting 2018-11-27 22:56:47 +08:00
  • 874515d773
    Update nacos-config.adoc pbting 2018-11-27 22:52:40 +08:00
  • 967705985a
    Update nacos-config.adoc pbting 2018-11-27 22:51:15 +08:00
  • fc4f1dae84
    修正Nacos Config 文档 pbting 2018-11-27 22:48:58 +08:00
  • 8d86ddc113
    Merge pull request #3 from spring-cloud-incubator/master pbting 2018-11-27 19:46:25 +08:00
  • 5683af3f09
    Update README-zh.md xiaojing 2018-11-27 19:18:49 +08:00
  • 6ebf1ffd3c
    Update README-zh.md xiaojing 2018-11-27 18:26:25 +08:00
  • 0896af32bb magic value refactor fangjian0423 2018-11-27 16:35:10 +08:00
  • 53e4e18ab2 update nacos version to 0.5.0 , close #113 flystar32 2018-11-27 14:31:45 +08:00
  • c6d955f589 update nacos version to 0.5.0 , close #113 flystar32 2018-11-27 14:31:37 +08:00
  • 2ab11490dc fixes #120 and do some refactor fangjian0423 2018-11-27 13:55:38 +08:00
  • e59d921aea
    Merge pull request #123 from fangjian0423/1.x xiaojing 2018-11-27 13:36:07 +08:00
  • 71f4295170 Merge remote-tracking branch 'upstream/1.x' into 1.x fangjian0423 2018-11-27 11:38:40 +08:00
  • 017b528e3a fix typo fangjian0423 2018-11-27 11:37:41 +08:00
  • d0aa5dabbb add rocketmq binder example fangjian0423 2018-11-27 11:36:58 +08:00
  • 3263d203c2 add rocketmq-binder and starter fangjian0423 2018-11-27 11:36:29 +08:00
  • 6e175b35d5 Fix bugs on example mercyblitz 2018-11-23 16:33:24 +08:00
  • b75b19b58c Polish Spring Cloud Bus mercyblitz 2018-11-23 14:52:45 +08:00
  • 10bb95c11a sentinel datasource refactor: including code refactor and update examples, docs fangjian0423 2018-11-22 19:18:40 +08:00
  • 15179aeee2
    Merge pull request #118 from pbting/master format 2018-11-22 17:30:20 +08:00
  • 0e4461e671
    Update acm.adoc pbting 2018-11-22 17:26:54 +08:00
  • 2a0296d1c8
    Update acm.adoc pbting 2018-11-22 17:25:51 +08:00
  • 59cbe7d8cf
    优化文档的描述 pbting 2018-11-22 17:22:40 +08:00
  • 1271ee91ee
    update nacos version xiaojing 2018-11-22 15:55:04 +08:00
  • 46d0881caa
    Merge pull request #117 from fangjian0423/master xiaojing 2018-11-22 15:39:19 +08:00
  • 9e9ca72c88 update rocketmq example fangjian0423 2018-11-22 15:12:45 +08:00
  • f79fdba50b update sentinel docs fangjian0423 2018-11-22 14:36:46 +08:00
  • 80ecc84d54 fixes #116 fangjian0423 2018-11-22 14:33:52 +08:00
  • 0ad0014cbf Polish spring-cloud-starter-bus-rocketmq mercybltz 2018-11-22 13:02:33 +08:00
  • b5ad5acf10
    Merge pull request #2 from spring-cloud-incubator/master pbting 2018-11-20 17:25:38 +08:00
  • bfae54b51e using eclipse code formatter to format code fangjian0423 2018-11-20 17:17:44 +08:00
  • c34ecfffd8
    Merge pull request #112 from fangjian0423/master xiaojing 2018-11-20 17:02:59 +08:00
  • 3a4baa156a add rocketmq example fangjian0423 2018-11-20 14:22:18 +08:00
  • 2596f014f7 add rocketmq starter and fix some small problems fangjian0423 2018-11-20 14:21:31 +08:00
  • 0819960020
    Merge pull request #1 from spring-cloud-incubator/master pbting 2018-11-20 14:18:59 +08:00
  • 4539ed7183 update sentinel example and add sentinel reference doc fangjian0423 2018-11-20 14:15:10 +08:00
  • 3c33b234c8 fixes #91 fangjian0423 2018-11-20 14:14:00 +08:00
  • d88e27e45c fix conflict fangjian0423 2018-11-20 12:00:36 +08:00
  • b4b8fa0d19 Polish Config Server mercyblitz 2018-11-19 16:18:33 +08:00
  • 0d88d81996
    update parent version xiaojing 2018-11-17 22:18:47 +08:00
  • 0990a9bddd
    Merge pull request #109 from pbting/master xiaojing 2018-11-16 16:19:36 +08:00
  • dfa8ebf539
    Merge pull request #82 from mercyblitz/master 小马哥 2018-11-16 10:13:29 +08:00
  • 5fed9125a1
    Merge branch 'master' into master 小马哥 2018-11-16 10:07:46 +08:00
  • 25a90a545e 更改Nacos 客户端的依赖的版本 pbting 2018-11-15 17:09:27 +08:00
  • 7ee36ec77b 更改Nacos Config 的 Reference 文档 pbting 2018-11-15 17:06:30 +08:00
  • 27854b9a59 更改Nacos Config 的 Reference 文档 pbting 2018-11-15 17:04:23 +08:00
  • 24f5f25b68 更改Nacos Config 的 Reference 文档 pbting 2018-11-15 16:53:32 +08:00
  • 0a93a94ed3 更改Nacos Config 的 Reference 文档 pbting 2018-11-15 16:50:38 +08:00
  • f10c2f7554
    使用域名配置Nacos服务端地址 pbting 2018-11-15 16:33:49 +08:00
  • eb0fe293de
    通过域名的方式来配置Nacos的地址 pbting 2018-11-15 16:29:36 +08:00
  • f54b24b3d4
    Merge branch 'master' into master pbting 2018-11-15 10:56:21 +08:00
  • 746a730614 添加 Nacos Discovery 到 Reference 目录列表 pbting 2018-11-15 10:52:18 +08:00
  • 2da80bb61e
    Merge pull request #108 from pbting/master xiaojing 2018-11-15 10:43:19 +08:00
  • 7501ea6bf5 去掉一行空格 pbting 2018-11-14 18:00:23 +08:00
  • 782749014e 订正格式错误 pengbingting 2018-11-14 17:48:35 +08:00
  • 243bb86876 订正格式错误 pengbingting 2018-11-14 17:45:55 +08:00
  • 598d30ac5c 订正 properties的拼写错误 pengbingting 2018-11-14 17:42:57 +08:00
  • 89c042ff23 订正 properties的拼写错误 pengbingting 2018-11-14 17:41:42 +08:00
  • 1eb31826f7 添加 Nacos Discovery 的reference 文档 pengbingting 2018-11-14 17:38:36 +08:00
  • 57cbb930d5
    Merge pull request #106 from pbting/master xiaojing 2018-11-13 19:12:48 +08:00
  • 2cd5e04de1
    Merge pull request #107 from xiaolongzuo/master xiaojing 2018-11-13 19:12:25 +08:00