Merge branch 'master' into pr/720-tim-bootstrap-security

This commit is contained in:
slavisa-baeldung
2016-10-29 19:24:37 +02:00
502 changed files with 5324 additions and 2462 deletions
@@ -1,6 +1,6 @@
server.port=8888
spring.cloud.config.server.git.uri=https://github.com/eugenp/tutorials/tree/master/spring-cloud-config/client-config
spring.cloud.config.server.git.clone-on-start=false
spring.cloud.config.server.git.uri=https://github.com/spring-cloud-samples/config-repo
spring.cloud.config.server.git.clone-on-start=true
security.user.name=root
security.user.password=s3cr3t
encrypt.key-store.location=classpath:/config-server.jks