zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,306 Commits 2 Branches 3 Tags 58 MiB
141f8a19ea
Commit Graph

1306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
得少
1869bea58f format log 2019-03-04 18:50:35 +08:00
nkorange
8c23f34806 #269 fix bug 2019-03-04 17:12:29 +08:00
得少
df15d56018 constract error message will transfor to pararent construct 2019-03-04 17:09:09 +08:00
得少
43a51c0f25 #861 2019-03-04 16:56:01 +08:00
pbting
5c96bca92c
Merge pull request #5 from alibaba/develop 
Sync the latest code from develop branch
 2019-03-04 13:10:16 +08:00
nkorange
af26af7e6e #502 fix bug 2019-03-04 11:24:41 +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
nkorange
39f63f3721 #502 fix method name error 2019-03-04 09:42:13 +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
pader
6290f8e12e
Merge pull request #6 from alibaba/develop 
pull latest code
 2019-03-01 08:56:57 +08:00
xxc
2b9d884f98
Merge pull request #849 from alibaba/develop 
Release 0.9.0 Nacos : Nacos server function mode and fixed 13 issues
 2019-03-01 01:10:07 +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
xxc
07973d34ee
Merge pull request #848 from alibaba/function_mode 
fix: state compatible
 2019-03-01 00:35:54 +08:00
LoadChange
6a6fe71c37 fix: state compatible 2019-02-28 21:10:37 +08:00
xxc
4aed990026
Merge pull request #847 from alibaba/function_mode 
Function mode
 2019-02-28 20:03:09 +08:00
xuechaos
f88b8018b5 merge develop to fix merge 2019-02-28 19:50:33 +08:00
Keep
dc03530eb1
Merge pull request #846 from hxy1991/fix_826 
Refactoring the log of naming
 2019-02-28 19:17:32 +08:00
xuechaos
ff51baae1c add lisence 2019-02-28 18:41:29 +08:00
zhichen
04bc0e2a03
Merge pull request #738 from loadchange/issues-735 
Fix Issues #735
 2019-02-28 18:03:28 +08:00
xuechaos
0ca7323df9 #588 build client and dependenties use 1.6 2019-02-28 17:52:06 +08:00
hxy1991
41e6ec9cbb Fixes #826 2019-02-28 17:50:29 +08:00
xuechaos
678fc8a5f7 update version get for pom 2019-02-28 17:34:25 +08:00
LoadChange
979c2bd6e1 fix: code indentation 2019-02-28 16:06:59 +08:00
xxc
f62c66e5ab
Merge pull request #833 from systp/master 
Align attribute name
 2019-02-28 15:42:31 +08:00
xxc
9636e819ff
Merge pull request #740 from jifengnan/develop 
[ISSUE #696] Nacos-server starts fail in windows
 2019-02-28 15:20:02 +08:00
LoadChange
b1b9beeba7 fix: Defragment code indentation 2019-02-28 14:22:29 +08:00
LoadChange
fdab4824e0 feat: optimize Console version && Menu 2019-02-28 14:18:10 +08:00
Fury Zhu
1e1e1beeb4
Merge pull request #810 from luoxn28/master 
signalPublish with not STANDALONE_MODE
 2019-02-28 14:16:19 +08:00
Fury Zhu
c1b70281fb
Merge pull request #843 from nanamikon/issues-823 
#821 Registering instance should update valid (health)
 2019-02-28 11:53:07 +08:00
kaitai.zj
718ec5a5b2 #821 Registering instance should update valid (health) 2019-02-28 10:53:51 +08:00
nkorange
eb4cd017aa #839 rename update switch method 2019-02-28 10:48:20 +08:00
Fury Zhu
1f7c2f9a7a
Merge pull request #823 from nanamikon/issues-821 
Registering instance should update valid (health)
 2019-02-27 22:39:02 +08:00
得少
c279d31c10 Merge remote-tracking branch 'origin/develop' into support_ans_developer 
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/identify/CredentialWatcher.java
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/HttpClient.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
 2019-02-27 20:42:30 +08:00
xuechaos
e9a7cfe0f3 issues template update optimization 2019-02-27 20:20:15 +08:00
xuechaos
5711ace91f function mode server code completed 2019-02-27 20:00:05 +08:00
pbting
9641ea8160
Merge pull request #4 from alibaba/develop 
Develop
 2019-02-27 19:36:04 +08:00
pbting
822fc2c801
Merge pull request #2 from alibaba/feature_support_ans 
Merge pull request #818 from pbting/feature_support_ans
 2019-02-27 18:23:57 +08:00
Fury Zhu
931a0f4ece
Merge pull request #835 from hxy1991/fix_814 
Fixes #814
 2019-02-27 18:09:53 +08:00
pbting
dca6261fd6
Merge pull request #1 from alibaba/develop 
Sync Develop Branch Code
 2019-02-27 17:31:44 +08:00
hxy1991
af016f072d Fixes #814 2019-02-27 17:16:06 +08:00
nkorange
ddf194ea00 Fix merge conflicts 2019-02-27 13:01:56 +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
尼古拉斯丶谭鹏
f6527edba1 Since you want to align, you are all aligned. 2019-02-26 15:32:29 +08:00
Keep
5580a95c66
Merge pull request #830 from hxy1991/feature_refactoring_log 
Refactoring log module
 2019-02-26 14:45:16 +08:00
hxy1991
0e9d3e678a Fixes #240 #826 #827 #828 2019-02-26 14:22:38 +08:00
Fury Zhu
5656642fe8
Merge pull request #825 from alibaba/feature_empty_service_list 
Fix #824
 2019-02-26 10:15:24 +08:00
nkorange
1f943dee6e Fix #824 2019-02-25 21:27:11 +08:00
kaitai.zj
56f91e70f7 #821 Registering instance should update valid (health) 2019-02-25 20:28:23 +08:00
TsingLiang
6b448c4bb5
Merge pull request #820 from alibaba/feature_fetchIp 
Feature fetch ip
 2019-02-25 19:05:59 +08:00