Merge branch '2.3.x' into 2.4.x

Closes gh-26405
spring-projects · May 7, 2021 · 559af27 · 559af27
2 parents efad44b + 22e965f
commit 559af27
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...t/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java b/...t/src/main/java/org/springframework/boot/testsupport/testcontainers/DockerImageNames.java
@@ -52,8 +52,8 @@ public static DockerImageName cassandra() {
 	}
 
 	/**
-	 * Return a {@link DockerImageName} suitable for running Cassandra.
-	 * @return a docker image name for running cassandra
+	 * Return a {@link DockerImageName} suitable for running Couchbase.
+	 * @return a docker image name for running couchbase
 	 */
 	public static DockerImageName couchbase() {
 		return DockerImageName.parse("couchbase/server").withTag(COUCHBASE_VERSION);