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

2062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Beldon
85a954525b remove the useless code that make ci errors 2019-10-21 23:48:09 +08:00
Beldon
3e03462038 fix the CI errors 2019-10-21 23:16:58 +08:00
Beldon
92fcfce50a clean code 2019-10-21 22:53:02 +08:00
Beldon
927e8d6fe4 Merge remote-tracking branch 'upstream/develop' into develop 
# Conflicts:
#	console/src/main/java/com/alibaba/nacos/console/controller/NamespaceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
 2019-10-21 22:36:24 +08:00
nkorange
124bf07617 Fix test case error. 2019-10-21 18:00:11 +08:00
Vettal Wu
07d08b381e Support snowflake instance id generator 
Signed-off-by: Vettal Wu <vettal.wd@alibaba-inc.com>
 2019-10-21 17:44:08 +08:00
ganghuo
86e2f4aea8 创建字符串不需要带入双引号，否则调用时会报Error:Unable access jarfile 2019-10-21 16:35:56 +08:00
Fury Zhu
fcf62bbd5d
Merge branch 'develop' into feature_mcp 2019-10-21 16:21:42 +08:00
Fury Zhu
4a30210345
Merge pull request #1879 from ly641921791/clean_code 
Clean up redundant StringUtils
 2019-10-21 14:55:29 +08:00
dizhe
d248bc9ecc Support unique instance index for each registered server 
Signed-off-by: dizhe <vettal.wd@alibaba-inc.com>
 2019-10-18 16:05:51 +08:00
Fury Zhu
8ae48904ca
Merge pull request #1944 from Nicholas2015/hotfix_get_subscribers_1878 
fix the getting subscribers error
 2019-10-18 09:59:39 +08:00
Nicholas2015
5939cec9bc fix the getting subscribers error 2019-10-17 22:47:40 +08:00
nkorange
f2021a5eda Fix #1906 2019-10-15 20:02:08 +08:00
Fury Zhu
45ca16f5fb
Merge pull request #1919 from satjd/bugfix-#1916 
[ISSUE #1916] Fix returning ErrCode:400 when register instances concurrently to non-existent services
 2019-10-15 19:57:52 +08:00
nkorange
21e7bcdde0 #1409 Fix PMD 2019-10-15 18:07:27 +08:00
nkorange
13d82582ee #1409 Update from Nacos 2019-10-15 17:45:07 +08:00
nkorange
584d73ba17 #1409 gRPC server tuned OK. 2019-10-15 16:03:54 +08:00
nkorange
d33b5a02d0 #1409 Introduce MCP server 2019-10-14 16:51:15 +08:00
Fury Zhu
2c350ac596
Merge pull request #1927 from alibaba/dependabot/maven/io.netty-netty-all-4.1.42.Final 
Bump netty-all from 4.0.42.Final to 4.1.42.Final
 2019-10-12 11:28:05 +08:00
dependabot[bot]
395b20c8ea
Bump netty-all from 4.0.42.Final to 4.1.42.Final 
Bumps [netty-all](https://github.com/netty/netty) from 4.0.42.Final to 4.1.42.Final.
- [Release notes](https://github.com/netty/netty/releases)
- [Commits](https://github.com/netty/netty/compare/netty-4.0.42.Final...netty-4.1.42.Final)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-10-12 03:04:56 +00:00
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
satjd
299c533c6c fix #1916 2019-10-11 11:28:58 +08:00
xxc
db8015fbc7
Merge pull request #1888 from brucelwl/develop 
bug fix #1841 @brucelwl
 2019-09-30 17:52:22 +08:00
bruce
63d044c6cb
bug fix 1841 
bug fix https://github.com/alibaba/nacos/issues/1841
 2019-09-27 18:42:42 +08:00
ly
221d81dab8 Clean up redundant StringUtils 2019-09-25 20:49:37 +08:00
LoadChange
4f85dc0df3 build fe 2019-09-25 20:23:09 +08:00
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
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
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