Commit Graph

1351 Commits

Author SHA1 Message Date
得少
26f2759184 syncing upstream develop code
merge branch 'develop' of https://github.com/alibaba/nacos into develop
2019-05-14 17:15:15 +08:00
xxc
822e975fb2 Update README.md
add Nepxion LOGO
2019-05-14 17:07:05 +08:00
Asa
86397593c4
Merge pull request #1201 from justlive1/master
修复服务详情页面集群列表获取只获取groupName=DEFAULT_GROUP的数据
2019-05-14 11:31:58 +08:00
Fury Zhu
80dd3bd104
Merge pull request #1212 from chuntaojun/develop
refactor(client): delete useless test case
2019-05-14 11:20:50 +08:00
justlive1
fd327268fe build 2019-05-13 17:48:57 +08:00
justlive1
11304ff0b6 Merge branch 'develop' of https://github.com/alibaba/nacos
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
2019-05-13 17:33:32 +08:00
chuntaojun
01b74be838 refactor(client): delete useless test case 2019-05-13 11:19:52 +08:00
Fury Zhu
1f1b047984
Merge pull request #1126 from XCXCXCXCX/ISSUE_#359
[#359] provide a way for user to implement their health checkers.
2019-05-12 11:04:14 +08:00
XCXCXCXCX
23454ffd84 fix something 2019-05-12 10:32:09 +08:00
Fury Zhu
a3da3136f6
Merge pull request #1161 from rushsky518/master
[ISSUE #1118] 历史配置文件保留天数,可配置
2019-05-12 00:12:31 +08:00
rushsky518
f1fd3bbb64
Update DumpService.java
property with prefix nacos.config
2019-05-10 17:31:55 +08:00
XCXCXCXCX
6dc3882eef fix something 2019-05-10 13:47:22 +08:00
justlive1
54e2afb7f9 修复服务分组为非DEFAULT_GROUP,服务详情集群列表获取为DEFAULT_GROUP 2019-05-09 16:27:04 +08:00
XCXCXCXCX
c137994384 fix pmd 2019-05-09 11:31:03 +08:00
Fury Zhu
df6f3a8df7
Merge pull request #1130 from chuntaojun/feature_service_curd
[ISSUE #747、#1154] Add create and update service methods in SDK and update instance operation
2019-05-09 10:45:54 +08:00
chuntaojun
221ce1237a fix(api): fix NamingMaintainFactory create NamingMaintainService cannot find Class 2019-05-09 10:22:16 +08:00
Fury Zhu
a6ef86d797
Merge pull request #1198 from nkorange/feature_filter_disabled_instances
Fix #1062
2019-05-09 10:21:46 +08:00
dungu.zpf
33de06a55e Fix #1062 2019-05-09 10:18:12 +08:00
chuntaojun
ac36a41d86 refactor(api、client): modify MaintainService to NamingMaintainService 2019-05-09 10:07:09 +08:00
XCXCXCXCX
af8e0951ad expose endpoint for front 2019-05-09 09:57:44 +08:00
chuntaojun
141f8a19ea refactor(client): 2019-05-08 15:29:01 +08:00
XCXCXCXCX
6695805c69 Let nacos-server.jar import external jar package 2019-05-08 09:14:54 +08:00
Fury Zhu
756862060f
Merge pull request #1122 from Diffblue-benchmarks/add-diffblue-tests
Add unit tests for com.alibaba.nacos.client.utils.StringUtils
2019-05-08 08:26:24 +08:00
Fury Zhu
968a69c260
Merge pull request #1151 from jifengnan/develop
[ISSUE #1150] Correct the Relationship between Services and Clusters
2019-05-08 08:22:25 +08:00
Andy
8e29a348a9 Deleted the chinese comments 2019-05-07 21:24:57 +08:00
Fury Zhu
73ebb86055
Merge pull request #1170 from ddatsh/master
fix typo
2019-05-07 17:52:07 +08:00
Fury Zhu
e9d10d83e9
Merge pull request #1181 from mingyixu/master
collation and analysis of the ignore test cases
2019-05-07 17:31:00 +08:00
xiaochun.xxc
effb66c386 梳理nacos集测ignore用例 2019-05-07 16:05:41 +08:00
chuntaojun
8c82f85a74 refactor: 2019-05-07 12:03:34 +08:00
chuntaojun
7ae757ac02 refactor(config): correct the mistake to Constants.HEALTH_CONTROLLER_PATH 2019-05-07 11:24:11 +08:00
chuntaojun
4817b26bc9 refactor(client): Fix the issues raised in the comments 2019-05-07 11:11:24 +08:00
peter zhang
eef6e73d94
fix typo
motify > modify
2019-05-06 15:25:02 +08:00
XCXCXCXCX
ef7e250675 do not allow to add same type 2019-05-05 14:55:31 +08:00
chuntaojun
f8ec782080 refactor(client): Delete Chinese comments 2019-05-05 10:12:30 +08:00
Andy
4fd773b534 Rollback to use NamingUtils to grab service name and group name 2019-05-04 21:06:31 +08:00
chuntaojun
320aca4d90 style(api): The revised code is in compliance with the specification 2019-04-30 19:27:06 +08:00
chuntaojun
1b76780cd1 refactor(naming): Modify the inheritance of NoneSelector class 2019-04-30 19:08:16 +08:00
chuntaojun
f2c046a395 refactor(client): Service operation function module split 2019-04-30 17:46:10 +08:00
rushsky518
71d9cb3e04 历史配置文件保留天数,可配置 2019-04-30 17:28:52 +08:00
Fury Zhu
0ebc68c3ac
Merge pull request #1159 from alibaba/hotfix_server_list_inconsistent
Hotfix server list inconsistent
2019-04-30 17:23:27 +08:00
nkorange
3d684b6f56 Fix #1091 2019-04-30 16:18:35 +08:00
Andy
312b75bc1b Add licence info 2019-04-30 00:35:59 +08:00
Andy
22a2969593 1. 修正服务和集群之间的关系(Correct the relationship between the service and cluster)
2. 创建集群时必须提供名字和所属服务(The name and the service are required to create a cluster)
3. 修正UtilsAndCommons.shakeUp的注释
2019-04-30 00:14:51 +08:00
XCXCXCXCX
0d436deca0 fix something 2019-04-29 20:54:17 +08:00
Fury Zhu
fdcd379371
Merge pull request #1101 from Albert-Hugo/feature-naming-event
[#1075]  NamingEvent add getGroupName and getClusters method
2019-04-28 19:26:48 +08:00
LoadChange
c9a5134de5 fix: group form validation 2019-04-28 14:41:11 +08:00
chuntaojun
79c3fc6547 Merge branch 'develop' of https://github.com/chuntaojun/nacos into feature_service_curd 2019-04-28 14:18:36 +08:00
XCXCXCXCX
5fec1098a9 fix about licence position 2019-04-28 09:35:39 +08:00
chuntaojun
39b3820150 refactor(client): delete unused file 2019-04-27 22:36:32 +08:00
chuntaojun
ea214e1d50 feat(client): add feature of service curd 2019-04-27 22:32:28 +08:00