Commit Graph

1827 Commits

Author SHA1 Message Date
xianlaioy
13e509679d style: Modifiers should be declared in the correct order;Map init 设置大小 避免扩容; 2019-09-09 17:55:02 +08:00
Fury Zhu
e5f6cab640
Merge pull request #1699 from alibaba/feature_enhance_interface
repair the NPE and Optimize related code
2019-09-09 09:45:34 +08:00
pbting
1ecd5f385c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 21:22:16 +08:00
Fury Zhu
29a013816a
Merge pull request #1752 from ly641921791/issue_1671
[ISSUE] #1671 Unified request header "Client-Version"
2019-09-06 15:06:16 +08:00
Fury Zhu
ad5405937d
Merge pull request #1760 from finalcola/fix1652
[ISSUE #1652] Update service description error in Open API Guide
2019-09-06 14:35:33 +08:00
Fury Zhu
3196bde706
Merge pull request #1813 from rushsky518/single_shutdown
shutdown.sh, close server from current dir
2019-09-06 14:18:28 +08:00
Fury Zhu
04af15e180
Merge pull request #1736 from EZLippi/develop
ISSUE #1733
2019-09-06 14:16:58 +08:00
pbting
56c439e929 fix #1609 2019-09-06 13:39:40 +08:00
pbting
d2383e65bb Merge branch 'feature_enhance_interface' of https://github.com/alibaba/nacos into feature_enhance_interface 2019-09-06 13:33:26 +08:00
pbting
1f1392be89 fix #1609 2019-09-06 13:33:05 +08:00
pbting
2431edae4c
Merge branch 'develop' into feature_enhance_interface 2019-09-06 13:27:52 +08:00
nkorange
95b92b06e9 Fix #1621 2019-09-06 12:53:31 +08:00
pbting
5e7be63343 Merge branch 'feature_enhance_interface' of https://github.com/alibaba/nacos into feature_enhance_interface 2019-09-06 12:19:53 +08:00
pbting
46bcece7aa repair speel error and add debug log 2019-09-06 12:19:16 +08:00
rushsky518
b2504fd398 #1507 close server from current dir 2019-09-06 11:40:36 +08:00
Fury Zhu
d1cc240397
Merge pull request #1776 from ly641921791/issue_1769
[Issue] #1769 Solve the bug of the clone configuration function
2019-09-06 10:54:47 +08:00
ly
40be568c01 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-31 10:39:42 +08:00
ly
815a339228 Merge remote-tracking branch 'upstream/develop' into issue_1769 2019-08-31 10:38:14 +08:00
ly
59a36f91e4 [Issue] #1769 Solve the bug of the clone configuration function 2019-08-30 21:31:40 +08:00
Fury Zhu
0808d0cc39
Merge pull request #1754 from xkcoding/develop
[ISSUE #1753] Remove [nacos-console] server.contextPath
2019-08-30 10:58:21 +08:00
Fury Zhu
5f990729be
Merge pull request #1765 from beldon/develop
fix #1764.
2019-08-30 10:17:36 +08:00
Fury Zhu
548354e77b
Merge branch 'develop' into develop 2019-08-30 10:17:20 +08:00
nkorange
4459dc73b9 Fix #1764 2019-08-30 10:15:38 +08:00
ly
1fd5ee360e [Issue] #1769 Solve the bug of the clone configuration function 2019-08-29 01:23:12 +08:00
pbting
17ab94dba8
Merge branch 'develop' into feature_enhance_interface 2019-08-28 18:19:01 +08:00
ly
721c5a4a58 Compatible with older versions 2019-08-27 23:56:45 +08:00
Beldon
bbad9d69b0 fix #1764. 2019-08-25 20:23:05 +08:00
zyy
3c910457ec Update service description error in Open API Guide 2019-08-23 19:50:59 +08:00
Yangkai.Shen
a1da8c121e 🐛 remove server.contextPath 2019-08-23 14:06:27 +08:00
ly
5d428a2366 [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:50:56 +08:00
ly
11b1d5128e Merge remote-tracking branch 'upstream/develop' into issue_1671 2019-08-23 00:41:51 +08:00
ly
3b4767384d [ISSUE] #1671 Unified request header "Client-Version" 2019-08-23 00:02:00 +08:00
Fury Zhu
756095dba7
Merge pull request #1543 from zhaoyuguang/zen5
Fix 1541
2019-08-22 16:46:58 +08:00
赵禹光
ea924e8b14 use API to create param 2019-08-22 11:03:47 +08:00
赵禹光
5b3690b823 use API to create param 2019-08-22 10:54:05 +08:00
赵禹光
d3fd616626 页面修复 2019-08-21 16:50:50 +08:00
赵禹光
571389ef4e Merge branch 'develop' into zen5
# Conflicts:
#	console/src/main/resources/static/js/main.js
2019-08-21 16:49:48 +08:00
ezlippi.ouyang
210f77ee6c fix: fix #1733 2019-08-21 13:10:13 +08:00
pbting
ce66b46e8a resolve conflict 2019-08-16 09:58:57 +08:00
pbting
caf01308e7 add comma division with some case to use 2019-08-16 09:46:04 +08:00
pbting
a6deeb1fed add comma division with some case to use 2019-08-16 09:45:47 +08:00
pbting
3bd5dcb1cf add comma division with some case to use 2019-08-16 09:44:06 +08:00
pbting
5222b9c407 cluster conf support multi instance inline seperator with ',' 2019-08-16 09:18:45 +08:00
pbting
be7237e8ae merge upstream develop the latest code 2019-08-15 16:48:43 +08:00
pbting
7c5b00291b Normalize http response entity with ResponseEntity by spring 2019-08-09 12:33:13 +08:00
pbting
68f170c930 repair httpGetLarge#httpGetLarge will call entity.getContentType().getElements() the contentType is NPE 2019-08-09 12:15:05 +08:00
pbting
6496ae5cd6 support datum is null case 2019-08-09 10:55:38 +08:00
pbting
f09909cd1f 1. Optimize log printing
2. Improve the robustness and readability of your code
2019-08-09 10:25:42 +08:00
nkorange
48ff738511 Use dynamic server version 2019-08-08 11:44:03 +08:00
nkorange
6ca2ee0cf8 Update version to 1.1.3 2019-08-06 18:55:05 +08:00