From adb02b97bc9cbf1a9ab0f31e0e8c3ebede590593 Mon Sep 17 00:00:00 2001
From: zhanhonglai <hlzhan@thoughtworks.com>
Date: Tue, 25 Jul 2017 07:19:23 +0800
Subject: [PATCH 1/2] [Honglai] fix readme typo (#748)

---
 docs/src/main/asciidoc/quickstart.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/main/asciidoc/quickstart.adoc b/docs/src/main/asciidoc/quickstart.adoc
index 3340b8f7..f8adef5b 100644
--- a/docs/src/main/asciidoc/quickstart.adoc
+++ b/docs/src/main/asciidoc/quickstart.adoc
@@ -11,7 +11,7 @@ IDE instead if you prefer (the main class is
 
 ----
 $ curl localhost:8888/foo/development
-{"name":"development","label":"master","propertySources":[
+{"name":"foo","label":"master","propertySources":[
   {"name":"https://github.com/scratches/config-repo/foo-development.properties","source":{"bar":"spam"}},
   {"name":"https://github.com/scratches/config-repo/foo.properties","source":{"foo":"bar"}}
 ]}

From 7f047fc0cec4a2961fda8644a0c0e99692b33e50 Mon Sep 17 00:00:00 2001
From: Ollie Hughes <ohughes@pivotal.io>
Date: Tue, 25 Jul 2017 11:32:49 +0100
Subject: [PATCH 2/2] Fix incorrect message when private key is missing

---
 .../cloud/config/server/ssh/PrivateKeyValidator.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ssh/PrivateKeyValidator.java b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ssh/PrivateKeyValidator.java
index 87055f7f..a3632538 100644
--- a/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ssh/PrivateKeyValidator.java
+++ b/spring-cloud-config-server/src/main/java/org/springframework/cloud/config/server/ssh/PrivateKeyValidator.java
@@ -68,7 +68,7 @@ public class PrivateKeyValidator implements ConstraintValidator<PrivateKeyIsVali
 	private boolean isPrivateKeyPresent(SshUri sshUriProperties, ConstraintValidatorContext context) {
 		if (!hasText(sshUriProperties.getPrivateKey())) {
 				context.buildConstraintViolationWithTemplate(
-						format("Property '%shostKey' must be set when '%shostKeyAlgorithm' is specified", GIT_PROPERTY_PREFIX, GIT_PROPERTY_PREFIX))
+						format("Property '%sprivateKey' must be set when '%signoreLocalSettings' is specified", GIT_PROPERTY_PREFIX, GIT_PROPERTY_PREFIX))
 						.addConstraintViolation();
 			return false;
 		}