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
余黄彬
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
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
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
mercyblitz
24de18a00c
Polish alibaba/spring-cloud-alibaba#1727 : rollback rocketmq-spring-boot-starter
2020-09-17 17:27:33 +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
K
64c8ebf536
update spring-cloud-dependencies-parent version
...
update spring-cloud-dependencies-parent version
2020-09-17 15:01:15 +08:00
K
c3afdad2b1
remove useless properties
...
remove useless properties
2020-09-17 15:00:25 +08:00
mercyblitz
b23dd033fb
Polish alibaba/spring-cloud-alibaba#1723 : 2.2.2.RELEASE undertow stop shows "Failed to stop bean 'nacosWatch'"
2020-09-17 14:43:30 +08:00
mercyblitz
8c5e745d1b
Upgrade the version to be 2.2.3-SNAPSHOT
2020-09-17 14:37:43 +08:00
K
fa21bc19ce
Merge pull request #7 from alibaba/master
...
sync
2020-09-15 08:44:23 +08:00
Mercy Ma
c0b056a90e
Merge pull request #1729 from yuhuangbin/master
...
[Enhancement] NacosWatch keep publish HeartbeatEvent
2020-09-15 08:08:52 +08:00
yuhuangbin
f284172fbb
fix
2020-09-14 21:31:54 +08:00
yuhuangbin
15ffaccc75
enhance
2020-09-14 15:30:10 +08:00
Mercy Ma
51baa35139
Merge pull request #1724 from yuhuangbin/master
...
[Enhancement] NacosDiscoveryClient always getNamingservice from Nacosmanager
2020-09-14 14:43:20 +08:00
K
6880e4bd7b
Merge pull request #6 from alibaba/master
...
sync
2020-09-14 14:38:40 +08:00
yuhuangbin
c5d68bb60f
enhance
2020-09-14 13:03:25 +08:00
Mercy Ma
4b06a6178d
Merge pull request #1722 from yuhuangbin/2.2.2
...
Fix some bugs for 2.2.2.RELEASE
2020-09-14 10:11:36 +08:00
yuhuangbin
b638480cf7
fix test
2020-09-14 09:40:19 +08:00
yuhuangbin
5b0d53388b
sentinel NacosDataSourceFactoryBean enhance
2020-09-14 08:57:08 +08:00
yuhuangbin
df156d4fa2
fix
2020-09-13 21:57:54 +08:00
yuhuangbin
e9a6eaa025
fix
2020-09-13 19:24:25 +08:00
yuhuangbin
702831cb8f
fix
2020-09-13 18:02:36 +08:00
余黄彬
2114262e47
Merge pull request #2 from alibaba/master
...
update
2020-09-13 17:39:26 +08:00
Mercy Ma
44e541d67d
Merge pull request #1714 from alibaba/2.2.2.RELEASE
...
2.2.2.release
2020-09-12 18:48:04 +08:00
Mercy Ma
1226a27482
Merge pull request #1713 from mercyblitz/master
...
Upgrade the version to be 2.2.2.RELEASE
2020-09-12 17:33:14 +08:00
mercyblitz
96c3d2e8ad
Upgrade the version to be 2.2.2.RELEASE
2020-09-12 16:13:18 +08:00
Mercy Ma
255db7a071
Merge pull request #1712 from mercyblitz/master
...
Upgrade the version to be 2.2.2.RELEASE
2020-09-12 15:48:35 +08:00
mercyblitz
35c4eac150
Upgrade the version to be 2.2.2.RELEASE
2020-09-11 23:08:30 +08:00
Mercy Ma
f10e750cbb
Merge pull request #1704 from yuhuangbin/issue#1701
...
NacosWatch to update local metadata
2020-09-11 17:05:50 +08:00
yuhuangbin
b35c05e4fc
fix
2020-09-11 16:23:02 +08:00
