Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge nacos develop to yanlinly master #6

Merged
merged 816 commits into from
Mar 27, 2019
Merged

merge nacos develop to yanlinly master #6

merged 816 commits into from
Mar 27, 2019

Conversation

yanlinly
Copy link
Owner

No description provided.

xuechaos and others added 30 commits January 30, 2019 17:09
@xuechaos
Update README.MD for update fenghuang LOGO
2231f6e 
Update README.MD for update fenghuang LOGO
@nkorange
#502 Fix bug
4c03773
@xuechaos
Merge pull request #724 from alibaba/develop
d411b31 
Update README.MD for update fenghuang LOGO
Fix #711
129e295
Merge pull request #712 from paderlol/develop
e33f2b0 
When using open jdk to log in to nacos it failed.   #711
@nkorange
#502 Fix bug
98ab392
@loadchange
fix: closes #735
589d6c3
@nkorange
#502 Most of the functions test OK.
e2e11ba
@nkorange
#502 Fix HTTP 302 use GET problem.
ab56211
@jifengnan
Merge pull request #3 from alibaba/develop
fadea95 
Merge the newest code
@jifengnan
Fix the issue which the server started failed if folder names contain…
e40d899 
… spaces.

Tested and passed on both windows 7 and 10.
@nkorange
#502 Fix test case not pass problem
026ec98
@nkorange
#502 Fix licence problem
cba85f0
@nkorange
#744 Add server status, #629 Add partition service warm up logic
58b8d16
@nkorange
#629 Raft service warm up
3b051f0
@nkorange
#631 Use protect threshold
4fe7c3d
@nkorange
#745 Support multiple server modes
194387b
@nkorange
#502 Add retry delay
78bf52f
@huangyunbin
#720 Memory leak in PushService
ab7e788
@nkorange
#745 Support service creation in AP mode
81dd9fb
@nkorange
#502 Fix write switch file error
846c23c
fix not support java 1.7
4eaf0e7
@pbting
support ans
1a6fa9e
@nkorange
#269 Support service group
9783240
@pbting
code format with idea
e9bbe49
@nkorange
#502 get ephemeral instance count
d340f4b
@nkorange
#757 domain to service
e24e836
@nkorange
#757 domain to service 90%
3735142
@nkorange
Fix #762
4260906
Merge pull request #763 from alibaba/hotfix_standalone_register_failed
1043f85 
Fix #762
hxy1991 and others added 26 commits March 19, 2019 14:36
@hxy1991
Fixes #925
dcaca7e
@TsingLiang
Merge pull request #926 from hxy1991/fix_925
33187e1 
Fixes #925
@loadchange
fix: function Mode default home page
320d694
@nkorange
#745 Modify default server mode
81bbbe6
Merge branch 'master' into hotfix_default_server_mode
cde0928
Merge pull request #937 from alibaba/hotfix_default_server_mode
78466d4 
#745 Modify default server mode
@xuechaos
Merge pull request #935 from loadchange/optimize
bf162f7 
Fix: Console default home page
@xuechaos
Update README.md
9af8e0e 
add LOGO using Nacos
@xuechaos
Update README.md
9895848 
update LOGO using Nacos
@xuechaos
Update README.md
8ea7a81 
update LOGO using Nacos
@nkorange
Fix #946
9b24b46
@loadchange
fix: delete service add group name
8ff2ced
Merge pull request #951 from loadchange/hotfix_service_api
7ce7681 
Fix: delete service add group name
@nkorange
Fix #938
da757f1
@nkorange
Fix #923
18b6523
Merge pull request #953 from alibaba/hotfix_server_mode
cb5eb8a 
Hotfix server mode
@nkorange
Update version to 1.0.0-RC2
fcf968c
@nkorange
Merge branch 'hotfix_server_mode' into develop
dc51aa5
@xuechaos
close#874 process nacos.nacos is id for start or stop
1e87e54
@xuechaos
Merge branch 'develop' of https://github.com/alibaba/nacos into develop
f043191
@nkorange
#502 Support delete service in AP mode
d5dc3e5
Merge pull request #954 from alibaba/1.0.0-RC2
a74f001 
1.0.0 rc2
@nkorange
#923 Add client beat method
e4579c9
@nkorange
Add namespace info in log
de25dc8
Merge pull request #959 from alibaba/hotfix_client_beat
cf8a3c7 
Hotfix client beat
@yanlinly
Merge branch 'master' into develop
074d243
@yanlinly yanlinly merged commit 06df9ab into yanlinly:master Mar 27, 2019
yanlinly pushed a commit that referenced this pull request Jul 11, 2019
@pbting
Merge pull request #6 from alibaba/develop
31b91e6 
Develop
yanlinly pushed a commit that referenced this pull request Jul 11, 2019
@IanCao
merge (#6)
928c07d 
* alibaba#1344 server-addr 支持 http 字符串

* 【issue】 alibaba#1425

* alibaba#1344 客户端本地缓存目录，剔除特殊字符串

* alibaba#1344 移动常量位置

* 格式

* feat: component subscribers
yanlinly pushed a commit that referenced this pull request Jul 11, 2019
@IanCao
Revert "merge (#6)" (#7)
5852ddc 
This reverts commit 928c07d.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.