merge from origin branch #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fix jdk8 license
* 'dev' of https://github.com/zhoutaoo/SpringCloud: Update .travis.yml Update .travis.yml 用户岗位表描述错误，修改
修复两个使用过程中发现的问题
* 'master' of https://github.com/zhoutaoo/SpringCloud: 修复歧义, fix #37 fix bug #36
Dev To Master
Dev To Master
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10 to 2.9.10.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10 to 2.9.10.1. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Signed-off-by: dependabot[bot] <support@github.com>
…tion-server/com.fasterxml.jackson.core-jackson-databind-2.9.10.1 Bump jackson-databind from 2.9.10 to 2.9.10.1 in /auth/authorization-server
….fasterxml.jackson.core-jackson-databind-2.9.10.1 Bump jackson-databind from 2.9.10 to 2.9.10.1 in /common/web
Dev To Master
去掉bus-server启动脚本
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge from origin branch