Merge branch '2.0.x'

2018-05-15 15:10:04 +02:00
parent d84cb44b1e be2234a8f0
commit e5ac3bc391
1 changed files with 0 additions and 1 deletions
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseProperties.java
@@ -142,7 +142,6 @@ public class CouchbaseProperties {
 			return this.keyValue;
 		}

-		@Deprecated
 		public void setKeyValue(int keyValue) {
 			this.keyValue = keyValue;
 		}