rushsky518
|
a815d7b7de
|
Merge branch 'develop' of https://github.com/rushsky518/nacos into develop
# Conflicts:
# config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
|
2019-10-11 20:09:19 +08:00 |
|
rushsky518
|
f3bd147317
|
#1550 nacos server return config type
|
2019-10-11 19:58:42 +08:00 |
|
Fury Zhu
|
72ea64ec4d
|
Merge branch 'develop' into develop
|
2019-09-19 17:23:50 +08:00 |
|
Fury Zhu
|
4b1a65c1cf
|
Merge pull request #1659 from Diffblue-benchmarks/add-GroupKey-tests
Add unit tests for com.alibaba.nacos.config.server.utils.GroupKey
|
2019-09-19 17:19:31 +08:00 |
|
Fury Zhu
|
caba884069
|
Merge pull request #1624 from KeRan213539/#1583_bug_fix
#1583 bug fix
|
2019-09-19 16:57:05 +08:00 |
|
Fury Zhu
|
e24a75c2bc
|
Merge pull request #1822 from EZLippi/hotfix/fix1665
ISSUE #1665
|
2019-09-17 14:46:13 +08:00 |
|
Fury Zhu
|
117eb6630f
|
Merge pull request #1792 from loadchange/issues/1759
fix: closes #1759
|
2019-09-17 14:36:42 +08:00 |
|
Fury Zhu
|
1e9fefca34
|
Merge pull request #1828 from universefeeler/fixed_cluster_page_bug
[ISSUE#1602] Fixed cluster page show bug
|
2019-09-17 14:28:02 +08:00 |
|
Fury Zhu
|
1a2a02a92e
|
Merge pull request #1831 from stackisok/master
fix issue #1825
|
2019-09-10 17:31:04 +08:00 |
|
Fury Zhu
|
06530aaa54
|
Merge pull request #1832 from xianlaioy/develop
style: Modifiers should be declared in the correct order;Map init 设置大小
|
2019-09-10 09:10:28 +08:00 |
|
xianlaioy
|
4e6d8b67a2
|
refactor: IO改成try resource。instanceList循环直接改成addAll
|
2019-09-09 20:42:48 +08:00 |
|
xianlaioy
|
08e69a0b21
|
refactor: 局部变量是线程安全的；
urlPattern改成static final；
GroupKey重构
|
2019-09-09 20:15:19 +08:00 |
|
xianlaioy
|
7b5c6e9273
|
style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容；
|
2019-09-09 17:56:14 +08:00 |
|
xianlaioy
|
13e509679d
|
style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容；
|
2019-09-09 17:55:02 +08:00 |
|
fox
|
d3b586b8e7
|
Merge pull request #4 from alibaba/develop
update
|
2019-09-09 17:45:07 +08:00 |
|
Fury Zhu
|
e5f6cab640
|
Merge pull request #1699 from alibaba/feature_enhance_interface
repair the NPE and Optimize related code
|
2019-09-09 09:45:34 +08:00 |
|
pbting
|
1ecd5f385c
|
Merge branch 'develop' into feature_enhance_interface
|
2019-09-06 21:22:16 +08:00 |
|
wangchenjun
|
8162533179
|
Make error information more specifically
|
2019-09-06 17:57:53 +08:00 |
|
Fury Zhu
|
29a013816a
|
Merge pull request #1752 from ly641921791/issue_1671
[ISSUE] #1671 Unified request header "Client-Version"
|
2019-09-06 15:06:16 +08:00 |
|
Fury Zhu
|
ad5405937d
|
Merge pull request #1760 from finalcola/fix1652
[ISSUE #1652] Update service description error in Open API Guide
|
2019-09-06 14:35:33 +08:00 |
|
Fury Zhu
|
3196bde706
|
Merge pull request #1813 from rushsky518/single_shutdown
shutdown.sh, close server from current dir
|
2019-09-06 14:18:28 +08:00 |
|
Fury Zhu
|
04af15e180
|
Merge pull request #1736 from EZLippi/develop
ISSUE #1733
|
2019-09-06 14:16:58 +08:00 |
|
pbting
|
56c439e929
|
fix #1609
|
2019-09-06 13:39:40 +08:00 |
|
pbting
|
d2383e65bb
|
Merge branch 'feature_enhance_interface' of https://github.com/alibaba/nacos into feature_enhance_interface
|
2019-09-06 13:33:26 +08:00 |
|
pbting
|
1f1392be89
|
fix #1609
|
2019-09-06 13:33:05 +08:00 |
|
pbting
|
2431edae4c
|
Merge branch 'develop' into feature_enhance_interface
|
2019-09-06 13:27:52 +08:00 |
|
nkorange
|
95b92b06e9
|
Fix #1621
|
2019-09-06 12:53:31 +08:00 |
|
pbting
|
5e7be63343
|
Merge branch 'feature_enhance_interface' of https://github.com/alibaba/nacos into feature_enhance_interface
|
2019-09-06 12:19:53 +08:00 |
|
pbting
|
46bcece7aa
|
repair speel error and add debug log
|
2019-09-06 12:19:16 +08:00 |
|
rushsky518
|
b2504fd398
|
#1507 close server from current dir
|
2019-09-06 11:40:36 +08:00 |
|
Fury Zhu
|
d1cc240397
|
Merge pull request #1776 from ly641921791/issue_1769
[Issue] #1769 Solve the bug of the clone configuration function
|
2019-09-06 10:54:47 +08:00 |
|
universefeeler
|
663296f54e
|
chore(cluster): delete no used note
|
2019-09-04 21:39:33 +08:00 |
|
universefeeler
|
473381b53d
|
fixed(cluster): fixed raft cluster state
|
2019-09-04 17:52:06 +08:00 |
|
fox
|
9651284ad1
|
Merge pull request #3 from alibaba/develop
update
|
2019-09-04 16:19:18 +08:00 |
|
LoadChange
|
519c2c0450
|
fix: closes #1759
|
2019-09-02 11:36:45 +08:00 |
|
ly
|
40be568c01
|
[Issue] #1769 Solve the bug of the clone configuration function
|
2019-08-31 10:39:42 +08:00 |
|
ly
|
815a339228
|
Merge remote-tracking branch 'upstream/develop' into issue_1769
|
2019-08-31 10:38:14 +08:00 |
|
ly
|
59a36f91e4
|
[Issue] #1769 Solve the bug of the clone configuration function
|
2019-08-30 21:31:40 +08:00 |
|
Fury Zhu
|
0808d0cc39
|
Merge pull request #1754 from xkcoding/develop
[ISSUE #1753] Remove [nacos-console] server.contextPath
|
2019-08-30 10:58:21 +08:00 |
|
Fury Zhu
|
5f990729be
|
Merge pull request #1765 from beldon/develop
fix #1764.
|
2019-08-30 10:17:36 +08:00 |
|
Fury Zhu
|
548354e77b
|
Merge branch 'develop' into develop
|
2019-08-30 10:17:20 +08:00 |
|
nkorange
|
4459dc73b9
|
Fix #1764
|
2019-08-30 10:15:38 +08:00 |
|
ly
|
1fd5ee360e
|
[Issue] #1769 Solve the bug of the clone configuration function
|
2019-08-29 01:23:12 +08:00 |
|
pbting
|
17ab94dba8
|
Merge branch 'develop' into feature_enhance_interface
|
2019-08-28 18:19:01 +08:00 |
|
ly
|
721c5a4a58
|
Compatible with older versions
|
2019-08-27 23:56:45 +08:00 |
|
Beldon
|
bbad9d69b0
|
fix #1764.
|
2019-08-25 20:23:05 +08:00 |
|
ezlippi.ouyang
|
f6da60ee55
|
fix: fix #1665
|
2019-08-24 11:38:46 +08:00 |
|
zyy
|
3c910457ec
|
Update service description error in Open API Guide
|
2019-08-23 19:50:59 +08:00 |
|
fox
|
4625daa40f
|
Merge pull request #2 from alibaba/develop
update to develop
|
2019-08-23 15:01:30 +08:00 |
|
Yangkai.Shen
|
a1da8c121e
|
🐛 remove server.contextPath
|
2019-08-23 14:06:27 +08:00 |
|