Merge branch 'master' into 2.0.x

This commit is contained in:
Spencer Gibb
2017-11-28 00:10:38 -05:00
22 changed files with 303 additions and 68 deletions

View File

@@ -24,7 +24,7 @@
<bintray.package>cli</bintray.package>
<docs.main>spring-cloud-cli</docs.main>
<main.basedir>${basedir}/..</main.basedir>
<spring-boot.version>2.0.0.M2</spring-boot.version>
<spring-boot.version>2.0.0.M6</spring-boot.version>
<spring-cloud.version>Finchley.BUILD-SNAPSHOT</spring-cloud.version>
</properties>
<modules>