theonefx.chenx
43a79105e0
update 2 SNAPSHOT version
2020-11-25 16:32:42 +08:00
zongyl
bcc262db15
update docs
2020-11-24 10:59:19 +08:00
余黄彬
e8de5cc8aa
Merge pull request #1823 from yuhuangbin/nacos
...
Optimize the way to get NacosWatch#ThreadPoolTaskScheduler
2020-11-20 14:54:12 +08:00
yuhuangbin
8f008191ad
Optimize the way to get NacosWatch ThreadPoolTaskScheduler
2020-11-19 17:12:40 +08:00
zkzlx
e26ef50af4
[pr #1531 ]build
2020-11-16 13:42:31 +08:00
zkzlx
359b3ea522
Merge remote-tracking branch 'origin/master' into config
...
# Conflicts:
# spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
2020-11-16 12:44:09 +08:00
余黄彬
336476b15d
Merge pull request #1799 from wangliang181230/bugfix-hystrix-RootContext.bind-throw-xid-must-be-not-null
...
bugfix: fix compatibility issue with 'seata-all-1.4.0'
2020-11-03 13:30:19 +08:00
王良
fa49d5f03c
bugfix: fix compatibility issues with 'seata-all-1.4.0'
2020-11-03 11:42:27 +08:00
Jim Fang
9abfee6737
Merge pull request #1780 from lltx/master
...
fix EndpointId logWarning
2020-10-26 17:10:25 +08:00
Jim Fang
956acad43e
Merge pull request #1772 from Roger3581321/patch-1
...
Add one missing configuration item
2020-10-26 16:50:47 +08:00
Jim Fang
7316db75be
Merge pull request #1771 from Flyfoxs/patch-1
...
update Seata example
2020-10-26 16:50:12 +08:00
Jim Fang
b5b26481bd
Merge pull request #1775 from qq32933432/master
...
modify Seata example
2020-10-26 16:47:41 +08:00
冷冷
6540555920
fix EndpointId logWarning
2020-10-15 13:33:48 +08:00
zhongguangxi
1934c4760d
maven project name change
2020-10-11 23:31:37 +08:00
Roger3581321
25689b800e
Add one missing configuration item
...
Since there is an important, yet missing option spring.cloud.nacos.discovery.enabled, I have added its description by following the "More configuration items" format.
2020-10-09 14:54:30 +08:00
Flyfoxs
11f8f02de6
Timeout exception in feign first time calling
...
第一次Feign调用时, 由于初始化懒加载, 可能会有timeout异常. 之前会被mock异常掩盖了.
2020-10-09 11:12:54 +08:00
余黄彬
9fb88da84c
Merge pull request #1 from alibaba/master
...
update
2020-09-19 09:10:53 +08:00
Mercy Ma
071256d56a
Merge pull request #1746 from mercyblitz/greenwich
...
[CodeBase] Sync the source code from 2.2.3.RELEASE to 2.1.3.RELEASE
2020-09-18 17:25:38 +08:00
mercyblitz
9e708b1c1c
Code Style
2020-09-18 17:08:59 +08:00
mercyblitz
a1f4ab0c4d
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Dubbo from master
2020-09-18 17:03:51 +08:00
mercyblitz
26243c801d
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Dubbo from master
2020-09-18 16:53:34 +08:00
mercyblitz
d50beeccf2
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Dubbo from master
2020-09-18 16:52:55 +08:00
mercyblitz
300478612f
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Sentinel from master
2020-09-18 16:45:39 +08:00
mercyblitz
f8cab52865
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Sidecar from master
2020-09-18 16:45:17 +08:00
mercyblitz
4003d3e15b
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Sentinel DataSource from master
2020-09-18 16:33:43 +08:00
mercyblitz
bae6878c0d
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Sidecar from master
2020-09-18 16:31:16 +08:00
mercyblitz
87df67b691
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Seata from master
2020-09-18 15:41:18 +08:00
mercyblitz
b2407823af
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Sentinel from master
2020-09-18 15:40:20 +08:00
mercyblitz
1040206269
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Nacos Discovery from master
2020-09-18 15:36:33 +08:00
余黄彬
29b955fffb
Update README-zh.md
2020-09-18 11:27:20 +08:00
余黄彬
6617c9aef8
Update README.md
2020-09-18 11:26:32 +08:00
mercyblitz
1315470fbe
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Seata from master
2020-09-18 11:18:55 +08:00
mercyblitz
bafe58a65a
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Sentinel from master
2020-09-18 11:18:32 +08:00
Mercy Ma
96a3807721
Merge pull request #1749 from alibaba/2.2.3.RELEASE
...
[CodeBase] Merge branch 2.2.3.release to master
2020-09-18 10:27:07 +08:00
Mercy Ma
2835024113
Merge pull request #1747 from mercyblitz/master
...
2.2.3.RELEASE
2020-09-17 22:05:41 +08:00
mercyblitz
b4abf6db15
Update the version to be 2.2.3.RELEASE
2020-09-17 21:31:59 +08:00
mercyblitz
03f0a44037
Polish alibaba/spring-cloud-alibaba#1739 : Sync the Nacos Config from master
2020-09-17 18:38:44 +08:00
mercyblitz
2b739a68e1
Update the version to be 2.1.3.RELEASE
2020-09-17 17:56:39 +08:00
Mercy Ma
de9f5a97c0
Merge pull request #1743 from mercyblitz/master
...
[Infrastructure] Upgrading the dependencies
2020-09-17 17:41:47 +08:00
mercyblitz
ea3f76c77f
Remove the useless properties
2020-09-17 17:41:33 +08:00
taogu.mxx
38e90fa1a7
Polish alibaba/spring-cloud-alibaba#1745 : [Infrastructure] Upgrading the dependencies for greenwich
2020-09-17 17:38:57 +08:00
mercyblitz
24de18a00c
Polish alibaba/spring-cloud-alibaba#1727 : rollback rocketmq-spring-boot-starter
2020-09-17 17:27:33 +08:00
taogu.mxx
a58263726e
Merge remote-tracking branch 'origin/greenwich' into greenwich
2020-09-17 17:07:51 +08:00
taogu.mxx
cdff6cf28b
Polish alibaba/spring-cloud-alibaba#1740 : [Infrastructure] Upgrading the Spring Cloud dependencies
2020-09-17 17:04:16 +08:00
mercyblitz
9842296af5
Merge remote-tracking branch 'upstream/master'
2020-09-17 16:47:58 +08:00
Mercy Ma
fbc8191d87
Merge pull request #1737 from mostcool/master
...
update pom.xml
2020-09-17 16:47:46 +08:00
mercyblitz
f40fe58dc9
Merge remote-tracking branch 'upstream/master'
2020-09-17 16:41:48 +08:00
mercyblitz
bb9dbba7d1
Polish alibaba/spring-cloud-alibaba#1741 : [Infrastructure] Upgrading the Nacos Client
2020-09-17 16:41:07 +08:00
mercyblitz
0e77fce012
Polish alibaba/spring-cloud-alibaba#1727 : upgrade rocketmq-spring-boot-starter
2020-09-17 15:09:33 +08:00
Mercy Ma
d6aff2e60d
Merge pull request #1736 from mercyblitz/master
...
[Issue] NPE issue on Alibaba's spring-context-support
2020-09-17 15:08:52 +08:00
