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 |
|
qingliang.ql
|
5b711c676a
|
static
|
2019-02-25 15:53:23 +08:00 |
|
qingliang.ql
|
7b60e2ef3f
|
getBoolean
|
2019-02-25 15:49:47 +08:00 |
|
qingliang.ql
|
47e753170e
|
constant
|
2019-02-25 14:43:26 +08:00 |
|
qingliang.ql
|
2b38145594
|
fix UT error
|
2019-02-25 14:31:25 +08:00 |
|
qingliang.ql
|
999a244eb3
|
fix read property file error
|
2019-02-25 12:16:21 +08:00 |
|
nkorange
|
871a4822c2
|
#502 validate instead of valid
|
2019-02-24 15:55:10 +08:00 |
|
nkorange
|
8d762a5403
|
#502 User server proxy instead of client proxy
|
2019-02-22 21:57:33 +08:00 |
|
nkorange
|
862ff80688
|
#502 Support update instance
|
2019-02-22 19:29:56 +08:00 |
|
Fury Zhu
|
3e1225b373
|
Merge pull request #818 from pbting/feature_support_ans
Support higher priority system properties for NamingService
|
2019-02-22 18:44:06 +08:00 |
|
pbting
|
f5d2782901
|
Update NamingProxy.java
|
2019-02-22 17:43:54 +08:00 |
|
pbting
|
e916431d65
|
Update SystemPropertyKeyConst.java
|
2019-02-22 17:43:28 +08:00 |
|
得少
|
b3ee9698fa
|
#817
|
2019-02-22 17:06:02 +08:00 |
|
qingliang.ql
|
eb87625083
|
fetch self ip
|
2019-02-22 16:24:26 +08:00 |
|
nkorange
|
59c2765ada
|
Fix #809
|
2019-02-22 12:25:05 +08:00 |
|
xxc
|
8c25a92d7a
|
Update README.md
add Nepxion LOGO
|
2019-02-22 11:35:24 +08:00 |
|
luoxn28
|
2c1d95d95c
|
signalPublish with not STANDALONE_MODE
|
2019-02-21 20:47:35 +08:00 |
|
nkorange
|
b8f4e86736
|
#502 Add distro annotation
|
2019-02-21 17:35:59 +08:00 |
|
nkorange
|
091e2e0cde
|
#502 Add distro annotation
|
2019-02-21 17:32:43 +08:00 |
|
nkorange
|
918dcf9905
|
#502 Fix bug
|
2019-02-20 20:09:59 +08:00 |
|
nkorange
|
71af535efd
|
#502 Rename key
|
2019-02-20 11:45:32 +08:00 |
|
Keep
|
12432b0eb0
|
Merge pull request #754 from alibaba/feature_metrics
fix not support java 1.7
|
2019-02-18 17:48:25 +08:00 |
|
Keep
|
ea618a0317
|
Merge pull request #778 from paderlol/develop
Fix #777
|
2019-02-18 17:45:45 +08:00 |
|
nkorange
|
7af1b480b8
|
#269 Support service group
|
2019-02-18 16:04:55 +08:00 |
|
qingliang.ql
|
45d94f8935
|
metrics
|
2019-02-18 15:14:48 +08:00 |
|
qingliang.ql
|
474438001d
|
Merge branch 'develop' into feature_metrics
|
2019-02-18 10:50:45 +08:00 |
|
nkorange
|
ce610d4ea5
|
Merge branch 'feature_naming_ap' into feature_naming_group
|
2019-02-18 10:02:03 +08:00 |
|
nkorange
|
c541ad93ed
|
Make SwitchDomain fields private
|
2019-02-18 09:30:12 +08:00 |
|
nkorange
|
9409ebfd8b
|
Merge branch 'feature_naming_ap' into feature_naming_group
# Conflicts:
# client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
|
2019-02-18 08:49:41 +08:00 |
|
nkorange
|
ede55b0e4f
|
Merge branch 'develop' into feature_naming_ap
|
2019-02-18 08:46:35 +08:00 |
|