zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,977 Commits 2 Branches 3 Tags 58 MiB
592385b43e
Commit Graph

1977 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
freekry
71ce4dad4d fix bug #1775 
fix bug #1775
 2019-09-25 20:18:58 +08:00
nkorange
f0c19859ce #1873, set default server expire timeout to 10 seconds and configurable. 2019-09-25 16:15:31 +08:00
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
nkorange
0b66b0c6fd Update jackson version, see https://nvd.nist.gov/vuln/detail/CVE-2019-16335 2019-09-24 10:57:02 +08:00
nkorange
9cf3f5747e Add synchronized when add/remove instance 2019-09-21 15:09:19 +08:00
Fury Zhu
43d44d015a
Merge pull request #1836 from universefeeler/improve_instance_health_flag 
[ISSUE 182]Improve instance health flag
 2019-09-20 14:59:13 +08:00
universefeeler
5413402869 improve(triggerFlag): improve instance health flag 2019-09-19 20:03:09 +08:00
Fury Zhu
0f82e0d577
Merge pull request #1594 from Diffblue-benchmarks/add-diffblue-tests-2 
Add unit tests for common.GroupKey and utils.MD5
 2019-09-19 17:24:49 +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
5bc80b948d
Merge branch 'master' into add-diffblue-tests-2 2019-09-19 17:10:48 +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
Beldon
514ae80c9a merge 2019-09-18 21:20:27 +08:00
Beldon
977e2f76b7 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/OperatorController.java
 2019-09-18 21:18:04 +08:00
universefeeler
c0a6adc083 chore(reiggerFlag): delete unused function 2019-09-18 12:04:48 +08:00
Beldon
83aa8e2186 clean controllers code 2019-09-18 00:12:20 +08:00
universefeeler
0f3c9f3c87 improve(triggerFlag): adjust triggerFlag calculation chance 2019-09-17 19:52:12 +08:00
wangchenjun
4ed7aa350b Avoiding conflicted for creating directory. 2019-09-17 16:34:06 +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
chuntaojun
5074d06903 Merge branch 'develop' of https://github.com/alibaba/nacos into develop 2019-09-11 22:44:02 +08:00
chuntaojun
8c47619af9 feat: 2019-09-11 22:43:57 +08:00
Fury Zhu
1a2a02a92e
Merge pull request #1831 from stackisok/master 
fix issue  #1825
 2019-09-10 17:31:04 +08:00
universefeeler
54ae846cb7 improve(instanceHealth): add update logic 2019-09-10 15:53:26 +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
universefeeler
f95215f218 chore(triggerFlag): adjust some details 2019-09-09 21:25:38 +08:00
xianlaioy
4e6d8b67a2 refactor: IO改成try resource。instanceList循环直接改成addAll 2019-09-09 20:42:48 +08:00
universefeeler
935918ed9e improve(triggerFlag): add pre check for triggerFlag 2019-09-09 20:24:59 +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
universefeeler
5681ca3f78 feture(triggerFlag): add frontend show triggerFlag 2019-09-09 15:13:24 +08:00
universefeeler
7f0bcaa5cb feature(triggerFlag): add triggerFlag for service 2019-09-09 10:48:11 +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