From b904eaa8866d905dd55009cb3e8f136134e7ef61 Mon Sep 17 00:00:00 2001
From: buildmaster <buildmaster@springframework.org>
Date: Tue, 21 Jan 2020 13:55:23 +0000
Subject: [PATCH 1/2] Bumping versions

---
 pom.xml                                   | 2 +-
 spring-cloud-netflix-dependencies/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ab7bfefb1..9dcad4082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
 		<bintray.package>netflix</bintray.package>
 		<spring-cloud-commons.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-commons.version>
 		<spring-cloud-config.version>2.2.2.BUILD-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-stream.version>Horsham.SR1</spring-cloud-stream.version>
+		<spring-cloud-stream.version>Horsham.BUILD-SNAPSHOT</spring-cloud-stream.version>
 		<!-- Has to be a stable version (not one that depends on this version of netflix): -->
 		<donotreplacespring-cloud-contract.version>2.1.3.RELEASE</donotreplacespring-cloud-contract.version>
 
diff --git a/spring-cloud-netflix-dependencies/pom.xml b/spring-cloud-netflix-dependencies/pom.xml
index 442a57709..8037cfa15 100644
--- a/spring-cloud-netflix-dependencies/pom.xml
+++ b/spring-cloud-netflix-dependencies/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.2.1.RELEASE</version>
+		<version>2.2.2.BUILD-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>

From cf95248c377cd499f4314551b1b82ea2b40838f9 Mon Sep 17 00:00:00 2001
From: Flora KALISA <akaliza@gmail.com>
Date: Mon, 20 Jan 2020 22:18:13 +0100
Subject: [PATCH 2/2] Documents defaultZone case sensitivity

Fixes gh-3695
---
 docs/src/main/asciidoc/spring-cloud-netflix.adoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/src/main/asciidoc/spring-cloud-netflix.adoc b/docs/src/main/asciidoc/spring-cloud-netflix.adoc
index 4b61bce78..c7ae95570 100755
--- a/docs/src/main/asciidoc/spring-cloud-netflix.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-netflix.adoc
@@ -63,7 +63,9 @@ eureka:
       defaultZone: http://localhost:8761/eureka/
 ----
 
-In the preceding example, "defaultZone" is a magic string fallback value that provides the service URL for any client that does not express a preference (in other words, it is a useful default).
+In the preceding example, `defaultZone` is a magic string fallback value that provides the service URL for any client that does not express a preference (in other words, it is a useful default).
+
+WARNING: The `defaultZone` property is case sensitive and requires camel case because the `serviceUrl` property is a `Map<String, String>`. Therefore, the `defaultZone` property does not follow the normal Spring Boot snake-case convention of `default-zone`.
 
 The default application name (that is, the service ID), virtual host, and non-secure port (taken from the `Environment`) are `${spring.application.name}`, `${spring.application.name}` and `${server.port}`, respectively.