Commit Graph

149 Commits

Author SHA1 Message Date
nkorange
4dc40311e6 Update version to 1.0.0-RC3 2019-04-03 10:43:08 +08:00
Fury Zhu
e0547c82ca
Merge pull request #997 from alibaba/feature_naming_group
Feature naming group
2019-04-02 20:57:04 +08:00
yanlinly
acaee3ffb5
Merge pull request #993 from alibaba/del_warnings
Remove spotbugs-annotations dependency
2019-04-02 10:31:06 +08:00
xxc
ec8046ef0d
Merge pull request #991 from yanlinly/master
remove lgpl dependency
2019-04-01 23:36:02 +08:00
water.lyl
0b6246e9f5 remove lgpl dependency 2019-04-01 21:16:44 +08:00
xuechaos
178b80ea41 del warnings spotbugs-annotations #981 2019-04-01 21:16:14 +08:00
hxy1991
df4f338a41 Fixes #984 2019-04-01 11:37:30 +08:00
nkorange
a745423dec Merge branch 'develop' into feature_naming_group
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	pom.xml
#	test/pom.xml
2019-03-25 15:03:31 +08:00
nkorange
dc51aa5703 Merge branch 'hotfix_server_mode' into develop 2019-03-22 17:31:36 +08:00
nkorange
fcf968c36b Update version to 1.0.0-RC2 2019-03-22 17:29:26 +08:00
nkorange
52d4e01bc7 #502 Fix several bugs 2019-03-18 20:57:28 +08:00
qingliang.ql
4cf86dfc66 fix derby size 大于32kb报错问题 2019-03-18 15:49:48 +08:00
nkorange
488075fa52 Update version to 1.0.0-RC1 2019-03-15 15:48:30 +08:00
Fury Zhu
01feb230a3
Merge pull request #855 from paderlol/develop
Nacos+MySQL8 startup error
2019-03-14 17:45:00 +08:00
nkorange
616a8031bc Merge branch 'develop' into feature_naming_group
# Conflicts:
#	api/pom.xml
#	client/pom.xml
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	cmdb/pom.xml
#	common/pom.xml
#	config/pom.xml
#	console/pom.xml
#	core/pom.xml
#	distribution/conf/application.properties
#	distribution/pom.xml
#	example/pom.xml
#	naming/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	pom.xml
#	test/pom.xml
2019-03-04 10:12:11 +08:00
zhanglong
3cb5089fd0 Refactor maven pom dependency and remove mysql jar from plugins dir 2019-03-03 17:48:24 +08:00
pader.zhang
2f0c503da1 Fix #852 #613 2019-03-02 11:50:59 +08:00
xuechaos
80c260e207 Release 0.9.0 Nacos : Nacos server function mode and fix 13 issues
* [#840] Nacos server adds startup mode to distinguish between config and naming.
* [#762] Register instance returns failed when the health check mode is 'server' in standalone mode.
* [#473] Nacos Cluster Mode kubernate Startup nacos.log error Log.
* [#240] Log strong dependence problem.
* [#824] getServicesOfServer throws exception if service list is empty.
* [#802] Nacos server multi-boot mode support.
* [#800] Nacos's client-to-server addressing mode document introduction.
* [#768] The interval at which the heartbeat is sent in BeatReactor is not controlled by the server return value.
* [#759] why instance can't auto-delete.
* [#756] Format of instance and service should be validated.
* [#720] Memory leak in PushService.
* [#653] IoUtils under nacos-common-0.2.1-RC1.jar lacks "" judgment on encoding.
* [#588] Client compatible to jdk1.6. On branch develop
2019-03-01 00:46:50 +08:00
xuechaos
678fc8a5f7 update version get for pom 2019-02-28 17:34:25 +08:00
nkorange
493715973f Merge branch 'develop' into feature_naming_group
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/NetUtils.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
2019-02-26 17:29:22 +08:00
hxy1991
0e9d3e678a Fixes #240 #826 #827 #828 2019-02-26 14:22:38 +08:00
qingliang.ql
eb87625083 fetch self ip 2019-02-22 16:24:26 +08:00
water.lyl
f29209b114 release 0.8 2019-01-22 22:16:13 +08:00
nkorange
cc9b6b58b7 Merge branch 'develop' into feature_naming_ap 2019-01-22 10:13:22 +08:00
water.lyl
9947e8565c change default user/password to nacos/nacos 2019-01-22 09:42:25 +08:00
nkorange
f2b43fb240 #502 Update author information 2019-01-19 21:23:35 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
wuyoushan
938666c7b8 remove useless semicolon 2019-01-17 18:02:44 +08:00
nkorange
425a80167b Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
2019-01-15 18:15:55 +08:00
nkorange
e9811c84c6 Merge branch 'develop' into feature_multi_tenant 2019-01-15 14:55:59 +08:00
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +08:00
nkorange
d0bfc0e179 Merge branch 'feature_multi_tenant' into feature_naming_ap
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/HttpHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/MysqlHealthCheckProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/healthcheck/TcpSuperSenseProcessor.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
2019-01-14 16:59:13 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
2019-01-14 16:01:14 +08:00
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +08:00
nkorange
baa4b4c1f1 #502 Update pom version 2019-01-13 10:26:23 +08:00
qingliang.ql
55c8f038e3 merge develop 2019-01-11 14:27:19 +08:00
Keep
21b7f96809
Merge pull request #446 from lostcharlie/develop
[ISSUE #442] Fix typos in class names and variables.
2019-01-11 14:19:43 +08:00
nkorange
9898a3c8e4 Merge branch 'develop' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/beat/BeatReactor.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/DomainsManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/HttpClient.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/UtilsAndCommons.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/test/java/com/alibaba/nacos/naming/core/DomainsManagerTest.java
#	test/src/test/java/com/alibaba/nacos/test/naming/RestAPI_ITCase.java
2019-01-11 14:08:13 +08:00
Keep
8fdbf685a8
Merge pull request #596 from fudali113/fix-get-remote-ip
Fixes #595
2019-01-09 20:35:17 +08:00
qingliang.ql
052901f27f support java 6 2019-01-09 20:06:02 +08:00
fudali
8ef18cbe7a fix: 添加新加测试文件授权头信息 2019-01-09 17:17:51 +08:00
fudali
0a229a7fcf fix: 在获取客服端真实 ip 的方法中添加获取根据 X-Forwarded-For header 来进行获取的实现 2019-01-09 16:21:38 +08:00
fudali
9ac02e638b feat: 获取客服端 ip 支持 X-Forwarded-For header 2019-01-09 16:13:31 +08:00
qingliang.ql
4101814db6 add license 2019-01-09 12:05:14 +08:00
qingliang.ql
fb5bbf3689 merge develop 2019-01-09 11:27:51 +08:00
qingliang.ql
4bcf4313e3 collect metrics to metrics monitor 2019-01-09 10:35:24 +08:00
qingliang.ql
d4821d6460 config metrics 2019-01-07 20:44:16 +08:00
nkorange
fed3c3f986 #498 Rename healthController bean and update pom version to 0.8.0-SNAPSHOT 2019-01-07 17:57:13 +08:00
FrankBian
41001899db format code: add @Override; translate some chinese msg to english; remove unneccessary method modifier 2019-01-07 15:48:01 +08:00
water.lyl
f77dbd0e6d Fix #381 format code, add license info 2019-01-06 21:55:59 +08:00