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.

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

同步alibaba develop到自己的develop #1

Merged
merged 289 commits into from
Dec 7, 2019

Conversation

xingguangsixian
Copy link
Owner

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

XXXXX

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

loadchange and others added 30 commits July 20, 2019 18:40
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
distro 使用本地时间记录心跳
Fully-qualified classname
com.alibaba.nacos.client.config.common.GroupKey
com.alibaba.nacos.client.config.utils.MD5

These tests were written using Diffblue Cover.
feat(config): support different db name and password
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
Fix #1519 The subscriber list is not displayed correctly
# Conflicts:
#	console/src/main/resources/static/css/main.css
#	console/src/main/resources/static/js/main.js
distro use local time to record heartbeat
# Conflicts:
#	console/src/main/resources/static/js/main.js
zhfish and others added 29 commits November 13, 2019 14:28
Bumps [jackson-databind](https:/FasterXML/jackson) from 2.9.10 to 2.9.10.1.
- [Release notes](https:/FasterXML/jackson/releases)
- [Commits](https:/FasterXML/jackson/commits)

Signed-off-by: dependabot[bot] <[email protected]>
…jackson.core-jackson-databind-2.9.10.1

Bump jackson-databind from 2.9.10 to 2.9.10.1
[ISSUE #2042] fix startup for java 11 and mysql8.0
refactor(client/config): increase the client's read timeout
[Issues 2025] Common classes in Nacos should be unified
optimize: the Boolean.parseBoolean(String s) method should be used when converting a String to a Boolean type
fix default value of database field
add client context path config
@xingguangsixian xingguangsixian merged commit dafcb7c into xingguangsixian:develop Dec 7, 2019
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.