Commit Graph

933 Commits

Author SHA1 Message Date
得少
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
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
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
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
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
nkorange
451863fe33 Update version to 0.8.1 2019-02-15 11:54:10 +08:00
nkorange
51fb41af8e Merge branch 'master' into feature_support_ans 2019-02-15 11:41:46 +08:00
Fury Zhu
7d1519e25d
Merge pull request #766 from pbting/0.8.0-poc-support-ans
0.8.0 poc support ans
2019-02-15 11:27:19 +08:00
pbting
5e78e9a315
Merge branch 'feature_support_ans' into 0.8.0-poc-support-ans 2019-02-15 11:08:03 +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
pbting
15e0f30849 fix #367 2019-02-14 18:00:01 +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
pbting
e9bbe492bb code format with idea 2019-02-13 16:12:16 +08:00
pbting
1a6fa9e69c support ans 2019-02-13 15:42:41 +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
Fury Zhu
e33f2b0f49
Merge pull request #712 from paderlol/develop
When using open jdk to log in to nacos it failed.   #711
2019-01-30 22:35:26 +08:00
pader.zhang
129e295aec Fix #711 2019-01-30 17:40:16 +08:00
xxc
d411b319aa
Merge pull request #724 from alibaba/develop
Update README.MD for update fenghuang LOGO
2019-01-30 17:31:00 +08:00
xxc
2231f6e4cf
Update README.MD for update fenghuang LOGO
Update README.MD for update fenghuang LOGO
2019-01-30 17:09:59 +08:00
xxc
76315108b7
Merge pull request #722 from alibaba/develop
update README.md for Who is using
2019-01-29 20:37:26 +08:00
xxc
4bbece8f64
update README.md for Who is using
update README.md for Who is using
2019-01-29 20:24:46 +08:00