fangjian0423
04434bf977
update docs
2019-07-29 14:45:52 +08:00
fangjian0423
e5deb0835a
Sentinel zk datasource add default server-addr
2019-07-29 00:08:57 +08:00
fangjian0423
a593f774e0
optimize pom
2019-07-29 00:08:24 +08:00
fangjian0423
3427a7345d
update sentinel demo
2019-07-29 00:07:32 +08:00
fangjian0423
9557879f44
update sentinel demo
2019-07-29 00:06:49 +08:00
format
c52a678251
Merge pull request #776 from Rivers-Shall/fix-#744
...
fix #744 Add spring.cloud.alicloud.acm.enable to ACM module
2019-07-26 19:17:47 +08:00
Rivers-Shall
888f138c79
Change configuration item name and add it to json file
...
Change configuration item name from `spring.cloud.alicloud.acm.enable`
to `spring.cloud.alicloud.acm.enabled` and add this configuration item
to `additional-spring-configuration-metadata.json` file.
2019-07-26 19:07:57 +08:00
format
9937bcf1a1
Merge pull request #778 from pigxcloud/master
...
✨ Introducing new features. Sentinel Support RedisDataSource…
2019-07-26 16:47:31 +08:00
fangjian0423
145c14058b
update sentinel examples
2019-07-26 12:41:00 +08:00
fangjian0423
9f8e6b2f5f
fix #782
2019-07-26 12:40:24 +08:00
format
36a4cc9c08
Merge pull request #766 from ly641921791/issues765
...
Fixes #765 Support customized beat interval of Nacos client
2019-07-25 16:50:10 +08:00
fangjian0423
4003350d09
fix fescar typo & other typo
2019-07-24 22:20:19 +08:00
fangjian0423
098ec40641
polish #761 update rocketmq bus pkg name for Greenwich
2019-07-24 22:19:42 +08:00
format
a94a2e8797
Merge pull request #779 from lovepoem/add_lib_to_fix_conpile_error
...
Fix the sample compile error
2019-07-24 11:20:58 +08:00
Xin Wang
7bd0adc99e
update circleci url
2019-07-24 11:00:49 +08:00
冷冷
0e79b0ed31
✨ Introducing new features. Sentinel Support RedisDataSource Dynamic Rule Configuration
2019-07-24 10:10:10 +08:00
ly
2b872b09e7
Merge branch 'master' into issues765
2019-07-23 23:17:19 +08:00
ly
7301700a90
Merge branch 'master' into issues765
...
# Conflicts:
# spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java
2019-07-23 23:11:23 +08:00
ly
36d95809ed
Merge pull request #1 from alibaba/master
...
Merge code from upstream
2019-07-23 22:19:31 +08:00
ly
1e51661fc7
Merge code from upstream
2019-07-23 22:18:35 +08:00
ly
1de313079c
Merge code from upstream
2019-07-23 21:40:11 +08:00
ly
af09456b7d
Merge code from upstream
2019-07-23 21:34:04 +08:00
format
5a1ab06497
Merge pull request #777 from slievrly/master_1
...
upgrade seata to 0.7.1 and update seata sample
2019-07-23 21:23:44 +08:00
slievrly
471a1228ff
upgrade seata to 0.7.1 and update seata sample
...
Signed-off-by: slievrly <slievrly@163.com>
2019-07-23 20:34:33 +08:00
Rivers-Shall
3193311af9
fix #744 Add spring.cloud.alicloud.acm.enable to ACM module
...
Add spring.cloud.alicloud.acm.enable to ACM module by adding
`@ConditionalOnProperty` annotations on auto-configuration classes and
bootstrap-configuration classes
2019-07-23 19:43:04 +08:00
format
0f55fcc696
Merge pull request #775 from 734184341/master
...
View acm's health interface through the URL
2019-07-23 18:44:28 +08:00
zhh
8369b0de0f
暴露acm的health接口
2019-07-23 17:13:06 +08:00
format
59c72752eb
Merge pull request #774 from Rivers-Shall/fix-acm-local-example
...
Fix acm-local-example
2019-07-23 16:45:15 +08:00
Rivers-Shall
bbc06485db
Fix acm-local-example
...
Make the example app automatically refresh value from acm config server
by adding `@RefreshScope` annotation.
2019-07-23 16:25:54 +08:00
fangjian0423
0f92340ac0
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README-zh.md
2019-07-23 11:20:19 +08:00
fangjian0423
3d0629e03b
update dingding qrcode
2019-07-23 11:20:05 +08:00
fangjian0423
82443b9bda
update dingding qrcode
2019-07-23 11:17:28 +08:00
fangjian0423
883c66f251
polish #761 update pkg name & maven coordinate for Greenwich
2019-07-23 11:03:08 +08:00
ly
5fd307f429
[Issues] 765 Support customized beat interval of Nacos client
2019-07-18 23:18:23 +08:00
ly
3860f5eabb
[Issues] 765 Support customized beat interval of Nacos client
2019-07-18 22:52:26 +08:00
ly
d332ae666b
[Issues] 765 Support customized beat interval of Nacos client
2019-07-18 22:28:46 +08:00
fangjian0423
5cf28cb7a6
Merge remote-tracking branch 'upstream/master'
2019-07-12 19:30:34 +08:00
fangjian0423
5f1ba177b6
remove spring-cloud-alibaba-test module
2019-07-12 19:29:26 +08:00
format
ef3574d57c
Merge pull request #748 from fangjian0423/master
...
package name & maven coordinates modification in Greenwich
2019-07-11 15:42:59 +08:00
fangjian0423
79a725f0c3
update nacos-client to 1.1.1
2019-07-11 15:26:03 +08:00
fangjian0423
5f549c553a
#734 -> fix circleci build error
2019-07-10 19:03:29 +08:00
fangjian0423
97844ea378
#734 -> fix circleci build error
2019-07-10 18:48:44 +08:00
fangjian0423
5fda294788
#734 -> fix circleci build error
2019-07-10 17:53:54 +08:00
fangjian0423
fd9a8f8816
update maven coordinates & docs
2019-07-10 17:15:26 +08:00
fangjian0423
cfd2544ff0
#734 -> update maven coordinates
2019-07-10 10:57:56 +08:00
fangjian0423
cb77edf8e1
#734 -> update maven coordinates
2019-07-10 10:44:08 +08:00
fangjian0423
4ff61869c1
#734 -> update pkg name
2019-07-09 18:08:36 +08:00
fangjian0423
52ac888164
#734 -> update pkg name
2019-07-08 22:42:12 +08:00
fangjian0423
aa03ddbbe2
#734 -> update maven coordinates
2019-07-08 11:38:30 +08:00
fangjian0423
3998ea23f7
NacosRule code format
2019-07-03 16:55:16 +08:00
