SpringCloud/spring-cloud-release
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Finchley

Browse Source 
# Conflicts:
#	docs/pom.xml
#	docs/src/main/asciidoc/spring-cloud-starters.adoc
#	pom.xml
#	spring-cloud-dependencies/pom.xml
#	spring-cloud-starter-parent/pom.xml
This commit is contained in:
Spencer Gibb
2017-06-30 09:57:12 -06:00
parent 8606c4d228 e2fb819e03
commit 472c7073b9
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/main/asciidoc/spring-cloud-starters.adoc
View File

@@ -3,7 +3,7 @@
:docslink: {githubmaster}/docs/src/main/asciidoc
:springcloudversion: Finchley.BUILD-SNAPSHOT
:springioplatformversion: Brussels-BUILD-SNAPSHOT
:springBootVersion: 1.5.0.BUILD-SNAPSHOT
:springBootVersion: 1.5.4.BUILD-SNAPSHOT
= Spring Cloud Release Train