Merge branch '2.0.x'

snicoll · snicoll · commit e5ac3bc391bf · 2018-05-15T15:10:04.000+02:00
diff --git 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 int getKeyValue() {
 			return this.keyValue;
 		}
 
-		@Deprecated
 		public void setKeyValue(int keyValue) {
 			this.keyValue = keyValue;
 		}

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,6 @@ public int getKeyValue() {`
`142`	`142`	`return this.keyValue;`
`143`	`143`	`}`
`144`	`144`
`145`		`- @Deprecated`
`146`	`145`	`public void setKeyValue(int keyValue) {`
`147`	`146`	`this.keyValue = keyValue;`
`148`	`147`	`}`