Skip to content

merge alibaba - #3

Merged
waveng merged 7 commits into
waveng:masterfrom
alibaba:master
Oct 17, 2018
Merged

merge alibaba#3
waveng merged 7 commits into
waveng:masterfrom
alibaba:master

Conversation

@waveng

@waveng waveng commented Oct 17, 2018

Copy link
Copy Markdown
Owner

Describe what this PR does / why we need it

Does this pull request fix one issue?

Describe how you did it

Describe how to verify it

Special notes for reviews

jasonjoo2010 and others added 7 commits October 16, 2018 11:23
* sentinel-transport-netty-http will also retry when port specified has been used
* LogBase support variable arguments
* Remove duplicated JVM properties overriding in SentinelConfig
* Add VersionUtil to get version from jar
update nacos version to 0.2.1.  change default port. 8080 -> 8848. fix port conflict.
Signed-off-by: Eric Zhao <sczyh16@gmail.com>
…etty-http (#185)

- Do a manual copying from unpooled direct buffer.
@waveng
waveng merged commit 4e32344 into waveng:master Oct 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants