Commit Graph

246 Commits

Author SHA1 Message Date
nkorange
1d81a6588d Update version to 1.2.0-beta.0 2020-02-05 14:11:09 +08:00
Peter Zhu
a425f7258e
Merge branch 'develop_1.2.0' into develop 2020-01-10 17:58:30 +08:00
Peter Zhu
13f5810751
Merge pull request #2266 from nkorange/feature_access_control
Feature access control
2020-01-10 17:54:29 +08:00
Peter Zhu
1849d96935
Merge pull request #1715 from rushsky518/develop
receive config change event
2020-01-10 15:41:24 +08:00
nkorange
82731985aa #1105 Add integration tests 2020-01-09 19:13:37 +08:00
nkorange
e2c553cbca #1105 Access control finish 80% 2019-12-18 20:25:10 +08:00
Peter Zhu
264f686d1c
Merge pull request #2142 from easyhaloo/code_optimization
refactor #2134 optimization code
2019-12-12 22:42:20 +08:00
nkorange
38590d060c Fix #2123 2019-12-06 11:53:01 +08:00
shenggangshu
1082539d89 refactor #2134 optimization code 2019-12-03 18:45:10 +08:00
nkorange
2781c6c84f Update version to 1.2.0-SNAPSHOT 2019-12-02 14:56:15 +08:00
rushsky518
3c1d6d00c3 #1550 添加单元测试;部分类移动到 api 模块 2019-11-28 11:56:04 +08:00
rushsky518
93773c47d6 #1550 抽象出 spi 接口 2019-11-26 21:35:05 +08:00
zzh
7582de9910 Modify the string splicing method of getgroupedname() 2019-11-06 10:15:38 +08:00
nkorange
5caa57351a Fix PMD 2019-10-30 10:20:16 +08:00
nkorange
f4f90a08ed Fix add metadata method NPE. 2019-10-29 15:36:12 +08:00
nkorange
4d68565667 Update version to 1.1.4 2019-10-24 14:46:46 +08:00
Fury Zhu
3f68ce083d
Merge pull request #1953 from nkorange/feature_mcp
Feature mcp
2019-10-22 18:02:15 +08:00
nkorange
225f0cae51 Fix findbugs 2019-10-22 17:05:48 +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
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
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
nkorange
6b7b894a0d Fix #1874 2019-09-25 15:46:34 +08:00
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:55:02 +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
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +08:00
赵禹光
571389ef4e Merge branch 'develop' into zen5
# Conflicts:
#	console/src/main/resources/static/js/main.js
2019-08-21 16:49:48 +08:00
rushsky518
b29e8c089c #1550 yaml 展平 2019-08-16 17:11:24 +08:00
pbting
a6deeb1fed add comma division with some case to use 2019-08-16 09:45:47 +08:00
pbting
3bd5dcb1cf add comma division with some case to use 2019-08-16 09:44:06 +08:00
rushsky518
1877e7d307 #1550 流程调通 2019-08-15 17:37:03 +08:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00
nkorange
15c913e346 Update version to 1.1.2 2019-08-06 17:10:37 +08:00
nkorange
11bd0ccd76 Update version to 1.1.2-SNAPSHOT 2019-08-02 12:35:04 +08:00
赵禹光
6a9b414315 fix bug 2019-08-01 20:56:52 +08:00
chuntaojun
09ce016ac8 fix(api): fix issue #1500 2019-07-07 11:39:21 +08:00
nkorange
15eff1c3db Merge remote-tracking branch 'upstream/develop' into develop 2019-07-05 22:00:06 +08:00
nkorange
6c8b3ea88e Update version to 1.1.0 2019-07-05 21:59:55 +08:00
chuntaojun
9277db2084 docs(api): add details desc 2019-07-05 17:26:27 +08:00
chuntaojun
039baee47d refactor(api): Restore the yaml() method to be compatible with older clients 2019-07-05 17:18:25 +08:00
得少
b2253301c3 1. Optimize code design and comment
2. Optimize address server repacakge
2019-07-05 11:05:37 +08:00
得少
7f97289340 Merge branch 'develop' into feature_address_server 2019-07-04 15:07:03 +08:00
nkorange
49027b892d Update version to 1.1.0-SNAPSHOT 2019-07-04 15:01:49 +08:00
得少
7336a8b7f5 fix #1458
support address server mode ,so nacos client will use the endpoint to initializer
2019-07-01 23:08:08 +08:00
Fury Zhu
819d5d1db5
Merge pull request #1404 from slievrly/charset
optimize charset、continue and return
2019-07-01 13:12:03 +08:00
Fury Zhu
dc7485b108
Merge pull request #1427 from chuntaojun/feat_config_prefix
[FEATURE] @NacosConfigurationProperties support prefix setting
2019-06-30 22:54:27 +08:00
nkorange
3a8575e22f Update version to 1.0.2-SNAPSHOT 2019-06-28 17:34:59 +08:00
nkorange
4605733595 Update version to 1.0.2 2019-06-28 17:18:59 +08:00
Fury Zhu
00f989f51e
Merge pull request #1426 from IanCao/master
【issue】 #1425
2019-06-27 18:51:38 +08:00