From 376e7fdfa1d02986e86fb4ecfd5536e2452f8510 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 27 Nov 2018 12:09:56 +0000
Subject: [PATCH 1/2] Document profile activation limitation of
 .spring-boot-devtools.properties

Closes gh-15151
---
 .../src/main/asciidoc/using-spring-boot.adoc                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
index df9d038111..67ff4b398e 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
@@ -1015,6 +1015,10 @@ property:
 	spring.devtools.reload.trigger-file=.reloadtrigger
 ----
 
+NOTE: Profiles activated in `.spring-boot-devtools.properties` will not affect the
+loading of <<spring-boot-features.adoc#boot-features-external-config-profile-specific-properties,
+profile-specific configuration files>>.
+
 
 
 [[using-boot-devtools-remote]]
@@ -1107,7 +1111,7 @@ TIP: If you need to use a proxy to access the remote application, configure the
 [[using-boot-devtools-remote-update]]
 ==== Remote Update
 The remote client monitors your application classpath for changes in the same way as the
-<<using-boot-devtools-restart,local restart>>. Any updated resource is pushed to the
+using-boot-devtools-restart,local restart>>. Any updated resource is pushed to the
 remote application and (_if required_) triggers a restart. This can be helpful if you
 iterate on a feature that uses a cloud service that you do not have locally. Generally,
 remote updates and restarts are much quicker than a full rebuild and deploy cycle.

From ae5d5235f619aeba9d43c2be077646256dfb3c95 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Tue, 27 Nov 2018 12:11:14 +0000
Subject: [PATCH 2/2] Upgrade to Spring Data Kay-SR12

Closes gh-14893
---
 spring-boot-project/spring-boot-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
index f132e5d77f..05553eb510 100644
--- a/spring-boot-project/spring-boot-dependencies/pom.xml
+++ b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -157,7 +157,7 @@
 		<spring-amqp.version>2.0.10.BUILD-SNAPSHOT</spring-amqp.version>
 		<spring-batch.version>4.0.1.RELEASE</spring-batch.version>
 		<spring-cloud-connectors.version>2.0.4.RELEASE</spring-cloud-connectors.version>
-		<spring-data-releasetrain.version>Kay-BUILD-SNAPSHOT</spring-data-releasetrain.version>
+		<spring-data-releasetrain.version>Kay-SR12</spring-data-releasetrain.version>
 		<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
 		<spring-integration.version>5.0.10.BUILD-SNAPSHOT</spring-integration.version>
 		<spring-kafka.version>2.1.10.RELEASE</spring-kafka.version>