Commit Graph

87 Commits

Author SHA1 Message Date
Fury Zhu
bdc3026798
Merge pull request #198 from alibaba/hotfix_update_service_error
Fix #197
2018-11-07 10:11:42 +08:00
Fury Zhu
3cbcbe94c0
Merge pull request #220 from nanamikon/master
PUT /instance should use param key "useIPPort4Check" instead of "userIPPort4Check"
2018-11-06 11:42:27 +08:00
water.lyl
7fdd80cc31 update version to 0.4.0 2018-11-05 20:34:37 +08:00
kaitai.zj
1a4c0e0550 bug fix: The key in the com.alibaba.nacos.api.naming.pojo.Cluster is "useIPPort4Check" instead of "userIPPort4Check" 2018-11-05 18:20:23 +08:00
nkorange
50be11d0ef Fix #197 2018-10-31 15:48:24 +08:00
xxc
eab2110033
Merge pull request #192 from alibaba/hotfix-clientbeat-lose-info
Fix #190
2018-10-31 15:30:17 +08:00
nkorange
dc7cb2bdee Fix #190 2018-10-30 17:59:05 +08:00
nkorange
ebb5cddd84 Not remove lock 2018-10-29 22:34:44 +08:00
nkorange
25f219623c Fix #150 2018-10-29 21:25:53 +08:00
xuechaos
077c4cdb6f release Nacos 0.3.0, update version to 0.3.0 2018-10-26 21:55:05 +08:00
xuechaos
9275dd7c24 update copyright 2018-10-25 19:02:32 +08:00
nkorange
abdc48fc84 Fix register instance with customized cluster name failed bug. 2018-10-25 15:56:02 +08:00
nkorange
855037cac6 Fix client side health check error 2018-10-25 13:22:22 +08:00
wyp12
1cf0a5b731 Merge remote-tracking branch 'origin/hotfix-clientbeat-failed' into feature_ServiceMesh 2018-10-24 18:00:02 +08:00
nkorange
f4e8684fdf Fix #149 2018-10-24 17:54:34 +08:00
nkorange
e3276d0114 Fix #150 2018-10-24 17:52:55 +08:00
wyp12
4da7557620 add enable 2018-10-24 11:17:47 +08:00
wyp12
5cc9137d66 update 2018-10-23 14:56:26 +08:00
xuechaos
1fbcf24521 update 0.3.0-RC1 uppercase letter 2018-10-19 18:36:29 +08:00
nkorange
6da8bf89fc Resolve conflicts and fix log error 2018-10-18 22:23:26 +08:00
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
nkorange
baa8594fe7 Merge branch 'master' into 0.3.0
# Conflicts:
#	api/pom.xml
#	config/pom.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	console/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/main/resources/application.properties
2018-10-18 17:11:32 +08:00
wyp12
503fb213ef Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-18 10:39:56 +08:00
nkorange
96abf18b41 Fix health check disabled bug 2018-10-18 10:28:50 +08:00
nkorange
0c034d5ee3 Fix health check is disabled bug 2018-10-17 20:26:15 +08:00
wyp12
a84fe24780 Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-17 19:59:40 +08:00
nkorange
f1b3e7d82d Optimize log display 2018-10-17 19:49:01 +08:00
wyp12
27d797ae60 Merge remote-tracking branch 'origin/0.3.0' into feature_ServiceMesh 2018-10-17 19:46:12 +08:00
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
nkorange
698cf480e0 Fix #130 2018-10-17 18:12:39 +08:00
mercyblitz
8f7c743a00 Fixed test cases 2018-10-17 16:39:12 +08:00
nkorange
7eaafd754d Fix health check incorrect bug 2018-10-17 14:51:24 +08:00
nkorange
e8c81e24ed Modify page display 2018-10-16 17:28:19 +08:00
nkorange
22d81e05ef Fix cluster name value incorrect bug. 2018-10-15 22:59:24 +08:00
nkorange
2be5171cf2 Fix service list page index error 2018-10-15 20:20:59 +08:00
nkorange
216007ff97 Fix update metadata failed bug, modify health status display words 2018-10-15 20:16:55 +08:00
小马哥
5c3ebf8f9f
Merge branch 'master' into 0.2.2 2018-10-15 17:10:48 +08:00
nkorange
71cf53361f Fix test failed bug 2018-10-14 12:07:50 +08:00
nkorange
712c0216d0 Make parameter 'enable' optional 2018-10-14 11:16:22 +08:00
nkorange
2ffeb256d3 Support update instance and query instance list 2018-10-13 12:19:10 +08:00
wyp12
e65459d088 add service Metadata 2018-10-12 18:07:55 +08:00
dungu.zpf
86d8c7a4c4 fix #121 and refactor health check model 2018-10-11 16:11:48 +08:00
小马哥
a5e9528dca
Merge pull request #113 from UfukOzcelik/change-apache-object-util-equals
[ISSUE #89] Change deprecated apache ObjectUtils equals to java.util Objects equals in PeerSet
2018-10-09 10:12:32 +08:00
zhangrenjie
43d73a1eb4 remove useless import 2018-10-08 17:57:45 +08:00
wyp12
dad2b1d370 fix verison fetch 2018-10-08 10:59:32 +08:00
UfukOzcelik
af36909e47 Change apache ObjectUtils equals to java.util Objects equals in PeerSet 2018-10-06 15:00:22 +03:00
dungu.zpf
fe47b683b3 1. Support get service detail, cluster detail and instance detail in a single method;
2. Server model refactored to extend classes in nacos-api;
2018-10-06 10:22:01 +08:00
mercyblitz
741ea7cbd7 Polish alibaba/nacos#111 : Replace naming module 2018-10-04 00:53:05 +08:00
mercyblitz
a203ab309f Polish alibaba/nacos#94 : remove <filtering>true</filtering> 2018-10-03 04:01:40 +08:00
mercyblitz
0424a4a1db Polish alibaba/nacos#94 : adapter modular logback whether current application is Spring or Spring Boot 2018-10-03 04:00:33 +08:00