Commit Graph

59 Commits

Author SHA1 Message Date
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
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
nkorange
f1b3e7d82d Optimize log display 2018-10-17 19:49:01 +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
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
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
mercyblitz
8a73c805d8 Polish alibaba/nacos#110 : remove application.properties and copy to META-INF/nacos-default.properties 2018-10-03 01:18:09 +08:00
mercyblitz
700a755ac5 Polish alibaba/nacos#109 : Exclude DataSourceAutoConfiguration using externalized configuration 2018-10-02 21:50:59 +08:00
mercyblitz
11204f8df6 Polish alibaba/nacos#108 : Remove duplicated banner.txt in sub-modules and move one into core module 2018-10-02 21:05:56 +08:00
mercyblitz
c0a25c148a Polish alibaba/nacos#105 2018-10-01 22:54:37 +08:00
mercyblitz
3b5eb060e8 Polish alibaba/nacos#103 2018-10-01 12:15:21 +08:00
mercyblitz
dc7a4eaa85 Polish alibaba/nacos#102 2018-10-01 11:34:36 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
mercyblitz
a718c84d4c Polish alibaba/nacos#104 2018-10-01 10:48:34 +08:00
xiaomage
421e9a347f Bug fix 2018-10-01 10:00:29 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
nkorange
b603b2ca39 Add naming console api 2018-09-28 16:23:55 +08:00
nkorange
5331546d2f Add naming console api 2018-09-28 16:22:34 +08:00
xxc
0b5add22c7
Merge pull request #81 from alibaba/0.2.2
0.2.2
2018-09-27 14:28:08 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
caogu.wyp@alibaba-inc.com
5803c6b34d fix duplicate Maven dependencies(#82) 2018-09-27 00:04:06 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
nkorange
f1c5dac508 Fix #78 2018-09-26 17:38:25 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
nkorange
ba84fda664 Fix #66 2018-09-21 16:19:25 +08:00
nkorange
4b5bdec0ab Fix #66, Enable deregistering the last instance 2018-09-21 16:13:41 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
xuechaos
4603fb221a update shell 2018-09-21 15:11:23 +08:00
xuechaos
b5fe4fd434 client jdk support 1.6 and del unuse file 2018-09-19 22:18:31 +08:00
nkorange
e2ef1f3da2 Fix #66 2018-09-19 19:45:44 +08:00