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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
nkorange
|
36b9b958f9
|
#634 Fix test case
|
2019-02-18 08:45:08 +08:00 |
|
nkorange
|
9f5f8bb379
|
#634 Add push switch
|
2019-02-18 08:42:24 +08:00 |
|
zhanglong
|
b8aaa5aa7c
|
Fix The number of configurations in the details of the default public namespace is incorrect. #777
|
2019-02-17 13:29:10 +08:00 |
|
pader
|
f4c8d68464
|
Merge pull request #5 from alibaba/develop
Merge the latest code
|
2019-02-17 13:03:05 +08:00 |
|
nkorange
|
4e6efbdde6
|
#502 Use Record as data base type
|
2019-02-17 11:08:41 +08:00 |
|
Fury Zhu
|
ee9447c388
|
Merge pull request #776 from darkness463/develop
[ISSUE #768] Fix: client beat interval is not controlled by server.
|
2019-02-17 09:46:46 +08:00 |
|
Darkness463
|
5760d13520
|
Fix https://github.com/alibaba/nacos/issues/768: Client beat interval.
|
2019-02-15 21:51:47 +08:00 |
|
Fury Zhu
|
5c0ee84fb1
|
Merge pull request #749 from huangyunbin/udp
#720 Memory leak in PushService
|
2019-02-15 16:56:26 +08:00 |
|
nkorange
|
469d976aee
|
#502 Fix sync timestamp repeat bug
|
2019-02-15 11:40:19 +08:00 |
|
nkorange
|
dd9db82b7b
|
Merge develop
|
2019-02-14 19:33:33 +08:00 |
|
nkorange
|
cd18124908
|
Merge branch 'feature_validate_service_format' into feature_naming_ap
# Conflicts:
# naming/src/main/java/com/alibaba/nacos/naming/core/Cluster.java
# naming/src/main/java/com/alibaba/nacos/naming/core/Instance.java
# naming/src/main/java/com/alibaba/nacos/naming/core/Service.java
# naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
|
2019-02-14 19:24:48 +08:00 |
|
Fury Zhu
|
9029e28415
|
Merge pull request #765 from alibaba/feature_validate_service_format
Fix #756
|
2019-02-14 18:07:03 +08:00 |
|
nkorange
|
f497f6ced0
|
Fix #756
|
2019-02-14 17:50:28 +08:00 |
|
Fury Zhu
|
eac25d6160
|
Merge pull request #764 from alibaba/hotfix_standalone_register_failed
Hotfix standalone register failed
|
2019-02-14 17:00:03 +08:00 |
|
nkorange
|
4260906973
|
Fix #762
|
2019-02-14 16:02:37 +08:00 |
|
nkorange
|
3735142788
|
#757 domain to service 90%
|
2019-02-14 15:11:46 +08:00 |
|
nkorange
|
e24e836dab
|
#757 domain to service
|
2019-02-14 11:08:39 +08:00 |
|
nkorange
|
d340f4bfa8
|
#502 get ephemeral instance count
|
2019-02-13 16:57:08 +08:00 |
|
nkorange
|
9783240e9d
|
#269 Support service group
|
2019-02-13 15:46:28 +08:00 |
|
qingliang.ql
|
4eaf0e7fbf
|
fix not support java 1.7
|
2019-02-13 15:31:17 +08:00 |
|
nkorange
|
846c23c4e5
|
#502 Fix write switch file error
|
2019-02-12 21:26:46 +08:00 |
|