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

133 Commits

Author SHA1 Message Date
xiaolongzuo
2c06acc996 Add SchedulerX module for branch 1.x. 2018-12-14 18:34:43 +08:00
xiaojing
8e0239dae1
Merge pull request #158 from fangjian0423/1.x
sync code about rocketmq and sentinel for 1.x branch
2018-12-12 17:08:13 +08:00
fangjian0423
b0238ac88d rocketmq binder update example for 1.x branch 2018-12-12 16:10:19 +08:00
fangjian0423
8f24bd979b rocketmq binder support transactional message and update example, docs for 1.x branch 2018-12-12 16:09:14 +08:00
fangjian0423
8f1b45b2e6 sentinel add docs and bug fix for 1.x branch 2018-12-12 16:04:56 +08:00
flystar32
d9abffd110 update readme 2018-12-10 17:13:38 +08:00
flystar32
06ac82a9ee update example configuration 2018-12-10 16:33:31 +08:00
xiaojing
fc9d016d0e
Merge pull request #143 from fangjian0423/1.x
Sentinel upgrade for 1.x branch
2018-12-06 19:10:39 +08:00
fangjian0423
4334798729 code format 2018-12-06 17:27:51 +08:00
fangjian0423
5ee251ab97 sentinel starter support paramflowrule 2018-12-06 17:26:47 +08:00
fangjian0423
29998b3e60 Add log configuration for Sentinel 2018-12-06 17:14:18 +08:00
fangjian0423
be2f52c880 using sentinel feign in nacos discovery example 2018-12-06 17:11:50 +08:00
fangjian0423
6104799a36 Sentinel support feign 2018-12-06 17:11:20 +08:00
fangjian0423
fb9e0f51f4 SentinelProtect rename to SentinelRestTemplate 2018-12-06 16:45:47 +08:00
xiaojing
e812515250
Merge pull request #136 from pbting/1.x
nacos config support custom config dataid and group
2018-12-05 10:24:42 +08:00
flystar32
bee06af41c update nacos discovery logic, support both health and enabled 2018-12-04 15:07:01 +08:00
pbting
4e76fbe773 modify the metadata of type and defaultValue for spring cloud cloud nacos config 2018-12-04 14:30:58 +08:00
pbting
46570f8ce3 nacos config support custom config dataid and group 2018-12-04 14:12:54 +08:00
xiaojing
51e9ae552a
Merge pull request #129 from fangjian0423/1.x
Refactor binder and update examples for 1.x branch
2018-11-29 14:14:14 +08:00
fangjian0423
e21d79b5d7 update rocketmq example readme 2018-11-29 14:05:28 +08:00
fangjian0423
ba9bbd6ab6 magic value refactor for 1.x 2018-11-29 11:23:04 +08:00
fangjian0423
08b1c3ab45 Merge remote-tracking branch 'upstream/1.x' into 1.x 2018-11-29 11:18:15 +08:00
fangjian0423
3e2564bdec update rocketmq exmaple for 1.x branch 2018-11-29 11:17:41 +08:00
fangjian0423
2c7ab714fb make metrics-core as provided dependency and refactor for 1.x branch 2018-11-29 11:17:08 +08:00
flystar32
53e4e18ab2 update nacos version to 0.5.0 , close #113 2018-11-27 14:31:45 +08:00
xiaojing
e59d921aea
Merge pull request #123 from fangjian0423/1.x
refactor sentinel datasource and add rocketmq binder for 1.x branch
2018-11-27 13:36:07 +08:00
fangjian0423
71f4295170 Merge remote-tracking branch 'upstream/1.x' into 1.x 2018-11-27 11:38:40 +08:00
fangjian0423
017b528e3a fix typo 2018-11-27 11:37:41 +08:00
fangjian0423
d0aa5dabbb add rocketmq binder example 2018-11-27 11:36:58 +08:00
fangjian0423
3263d203c2 add rocketmq-binder and starter 2018-11-27 11:36:29 +08:00
fangjian0423
10bb95c11a sentinel datasource refactor: including code refactor and update examples, docs 2018-11-22 19:18:40 +08:00
xiaojing
1271ee91ee
update nacos version 2018-11-22 15:55:04 +08:00
xiaojing
5403fe3165
Merge pull request #95 from xiaolongzuo/1.x
Fix build error。
2018-11-06 17:34:10 +08:00
xiaolongzuo
7945f7ebf0 Fix build error。 2018-11-06 17:30:30 +08:00
xiaojing
4494f63e8b
Merge pull request #93 from fangjian0423/1.x
Add reference doc module for 1.x branch
2018-11-06 17:29:37 +08:00
fangjian0423
24f2b4cedf Polish #48 2018-11-06 17:11:27 +08:00
xiaojing
6925f1419d
Merge pull request #89 from HaojunRen/1.x
fixes #87.
2018-11-05 11:44:13 +08:00
Nepxion
b9f3a374fb fixes #87. 2018-11-03 19:37:46 +08:00
Neptune
fe28674457
Merge pull request #6 from spring-cloud-incubator/1.x
Merge
2018-11-03 18:28:44 +08:00
xiaojing
e5b2a249db
fix typo 2018-11-02 09:51:15 +08:00
Spencer Gibb
60ec539e1d
Update to 0.1.1.BUILD-SNAPSHOT 2018-10-30 16:33:23 -04:00
Spencer Gibb
883b3b9b3b
Update SNAPSHOT to 0.1.0.RELEASE v0.1.0.RELEASE 2018-10-30 16:14:32 -04:00
Spencer Gibb
b4b727f4d8
Bumps spring cloud netflix to 1.4.6.RELEASE 2018-10-30 16:09:12 -04:00
xiaojing
87099c6851
Merge pull request #80 from xiaolongzuo/1.x
Fix configuration specification
2018-10-30 21:32:15 +08:00
flystar32
f3794ae824 update sentinel version to 1.3.0-GA 2018-10-30 21:08:14 +08:00
xiaolongzuo
1c2c74e186 Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x 2018-10-30 20:54:01 +08:00
xiaolongzuo
5353abd199 Fix configuration specification. 2018-10-30 20:53:13 +08:00
xiaolongzuo
8b9b06e4e8 Fix configuration specification. 2018-10-30 20:52:55 +08:00
flystar32
6ed038ec2e fix endpoint 2018-10-30 20:20:40 +08:00
xiaojing
f9603bf8f7
Merge pull request #78 from xiaolongzuo/1.x
Extract acm configuration to bootstrap phase.
2018-10-30 16:21:11 +08:00