Merge remote-tracking branch 'origin/1.4.x'
# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-config-client/pom.xml # spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java # spring-cloud-config-dependencies/pom.xml # spring-cloud-config-monitor/pom.xml # spring-cloud-config-sample/pom.xml # spring-cloud-config-server/pom.xml # spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ssh/SshUri.java # spring-cloud-config-server/src/test/java/org/springframework/cloud/config/server/ssh/PropertyBasedSshSessionFactoryTest.java # spring-cloud-starter-config/pom.xml
This commit is contained in:
Ryan Baxter