Skip to content

Commit 71ca952

Browse files
committed
Merge branch '3.3.x'
Closes gh-41921
2 parents e5d97cc + a19d69e commit 71ca952

File tree

4 files changed

+5
-5
lines changed
  • spring-boot-project

4 files changed

+5
-5
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/metrics.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ Auto-configuration registers a `MongoMetricsConnectionPoolListener` with the aut
10821082

10831083
The following gauge metrics are created for the connection pool:
10841084

1085-
* `mongodb.driver.pool.size` reports the current size of the connection pool, including idle and and in-use members.
1085+
* `mongodb.driver.pool.size` reports the current size of the connection pool, including idle and in-use members.
10861086
* `mongodb.driver.pool.checkedout` reports the count of connections that are currently in use.
10871087
* `mongodb.driver.pool.waitqueuesize` reports the current size of the wait queue for a connection from the pool.
10881088

spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.springframework.util.Assert;
4444

4545
/**
46-
* References to container images used for integration tests. This class also acts a a
46+
* References to container images used for integration tests. This class also acts a
4747
* central location for tests to {@link #container(Class) create} a correctly configured
4848
* {@link Container testcontainer}.
4949
*

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/JarUri.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919
import java.net.URI;
2020

2121
/**
22-
* Simple class that understands Jar URLs can can provide short descriptions.
22+
* Simple class that understands Jar URLs and can provide short descriptions.
2323
*
2424
* @author Phillip Webb
2525
*/

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemSslStoreDetails.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @param password the password used
3030
* {@link KeyStore#setKeyEntry(String, java.security.Key, char[], java.security.cert.Certificate[])
3131
* setting key entries} in the {@link KeyStore}
32-
* @param certificates the certificates content (either the PEM content itself or or a
32+
* @param certificates the certificates content (either the PEM content itself or a
3333
* reference to the resource to load). When a {@link #privateKey() private key} is present
3434
* this value is treated as a certificate chain, otherwise it is treated a list of
3535
* certificates that should all be registered.

0 commit comments

Comments
 (0)