Commit Graph

942 Commits

Author SHA1 Message Date
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
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
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
Fury Zhu
931a0f4ece
Merge pull request #835 from hxy1991/fix_814
Fixes #814
2019-02-27 18:09:53 +08:00
hxy1991
af016f072d Fixes #814 2019-02-27 17:16:06 +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
qingliang.ql
eb87625083 fetch self ip 2019-02-22 16:24:26 +08:00
luoxn28
2c1d95d95c signalPublish with not STANDALONE_MODE 2019-02-21 20:47:35 +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
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
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
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
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
Fury Zhu
1043f855c7
Merge pull request #763 from alibaba/hotfix_standalone_register_failed
Fix #762
2019-02-14 16:14:39 +08:00
nkorange
4260906973 Fix #762 2019-02-14 16:02:37 +08:00
qingliang.ql
4eaf0e7fbf fix not support java 1.7 2019-02-13 15:31:17 +08:00
huangyunbin
ab7e7886f8 #720 Memory leak in PushService 2019-02-12 15:32:54 +08:00