root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
39,841 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

3041 Commits

Author SHA1 Message Date
Moritz Halbritter ae75d4386c Merge branch '2.6.x' into 2.7.x 2022-06-21 14:01:18 +02:00
Moritz Halbritter b56b95d429 Add Apache HttpClient WebClient support to documentation 2022-06-21 14:00:55 +02:00
Stephane Nicoll 8e569210ce Merge branch '2.7.x' 
Closes gh-31466
 2022-06-20 14:38:56 +02:00
Sébastien Deleuze b5d380c1cb Make SpringApplication Kotlin samples idiomatic 
See gh-31463
 2022-06-20 14:38:43 +02:00
Stephane Nicoll 3118b7380d Merge branch '2.7.x' 
Closes gh-31461
 2022-06-20 10:35:30 +02:00
Stephane Nicoll 8b9579eeb7 Polish "Harmonize Kotlin example" 
See gh-31458
 2022-06-20 10:33:34 +02:00
ningenMe 6685d49faa Harmonize Kotlin example 
See gh-31458
 2022-06-20 10:27:04 +02:00
Madhura Bhave 55d6a87fef Remove support for multiple batch jobs 
Closes gh-25373
 2022-06-15 09:34:10 -07:00
Andy Wilkinson fabe0637cd Raise the minimum supported version of Kotlin to 1.7 
Closes gh-31391
 2022-06-15 10:53:26 +01:00
Phillip Webb 85dcbf6100 Merge branch '2.7.x' 
Closes gh-31385
 2022-06-14 09:38:36 -07:00
Phillip Webb e0947459b6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31384
 2022-06-14 09:38:05 -07:00
Phillip Webb 9f8a262e6b Log a warning when a health indicator takes too long to run 
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.

Fixes gh-31231
 2022-06-14 09:32:07 -07:00
Andy Wilkinson 6894f561ce Merge branch '2.7.x' 
Closes gh-31382
 2022-06-14 11:55:54 +01:00
Andy Wilkinson ab67136664 Merge branch '2.6.x' into 2.7.x 
Closes gh-31381
 2022-06-14 11:55:17 +01:00
Andy Wilkinson 2094722e5d Remove duplicate content from "The Spring WebFlux Framework" 
Closes gh-31378
 2022-06-14 11:52:06 +01:00
Phillip Webb 6dea2f0e8d Merge branch '2.7.x' 
Closes gh-31370
 2022-06-13 18:20:32 -07:00
Phillip Webb 0be5078a73 Merge branch '2.6.x' into 2.7.x 
Closes gh-31369
 2022-06-13 18:20:07 -07:00
Phillip Webb b3a46fc50e Document that placeholders should us the canonical property name form 
Closes gh-31309
 2022-06-13 18:19:47 -07:00
Phillip Webb 378e56f1d3 Add Order annotation to GraphQL RouterFunction beans 
Update GraphQL auto-configuration so that `RouterFunction` beans have
and `@Order` of 0.

Fixes gh-31314
 2022-06-13 16:44:20 -07:00
Stephane Nicoll cc4965ee8a Merge branch '2.7.x' 
Closes gh-31367
 2022-06-13 16:04:07 +02:00
Stephane Nicoll 961b979d6e Merge branch '2.6.x' into 2.7.x 
Closes gh-31366
 2022-06-13 16:04:00 +02:00
Anthony Vanelverdinghe 1fffdbae2a Fix typos in the reference documentation 
See gh-31328
 2022-06-13 16:02:48 +02:00
Stephane Nicoll 59f6661166 Merge branch '2.7.x' 
Closes gh-31361
 2022-06-13 14:54:09 +02:00
Stephane Nicoll 56913a08b8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31360
 2022-06-13 14:54:00 +02:00
Anthony Vanelverdinghe b1ccb600f3 Remove reference to outdated location 
See gh-31276
 2022-06-13 14:52:38 +02:00
Stephane Nicoll 41d327df51 Merge branch '2.7.x' 
Closes gh-31359
 2022-06-13 14:50:41 +02:00
Stephane Nicoll 06d7e67e79 Merge branch '2.6.x' into 2.7.x 
Closes gh-31358
 2022-06-13 14:50:35 +02:00
Stern, Ittay (is9613) e05363f9b0 Restore Custom Favicon section in the reference guide 
The section about favicon was mistakenly removed in 5fceb9d and this
commit reinstates it.

See gh-31224
 2022-06-13 14:50:18 +02:00
Stephane Nicoll ed7ff31d01 Merge branch '2.7.x' 
Closes gh-31357
 2022-06-13 14:46:04 +02:00
Stephane Nicoll 4b0fe63bdf Merge branch '2.6.x' into 2.7.x 
Closes gh-31356
 2022-06-13 14:45:54 +02:00
Stephane Nicoll d896d995d1 Polish contribution 
See gh-31190
 2022-06-13 14:39:58 +02:00
tudormarc e313aa5f6c Document that Lombok must be configured before our annotation processor 
See gh-31190
 2022-06-13 14:33:21 +02:00
Stephane Nicoll 365d96daf6 Merge branch '2.7.x' 
Closes gh-31355
 2022-06-13 14:29:40 +02:00
Stephane Nicoll 72dd51ae0b Merge branch '2.6.x' into 2.7.x 
Closes gh-31354
 2022-06-13 14:29:18 +02:00
Henning Poettker 9fdd471adf Use Lambda-based API in Spring Security examples 
See gh-31143
 2022-06-13 13:15:56 +02:00
Phillip Webb ff4e6f7639 Merge branch '2.7.x' 
Closes gh-31339
 2022-06-10 12:38:48 -07:00
Phillip Webb 0f7fa84214 Polish 'Update Dynatrace documentation for Micrometer 1.9.0' 
See gh-31132
 2022-06-10 12:36:45 -07:00
Georg Pirklbauer 6df9f50642 Update Dynatrace documentation for Micrometer 1.9.0 
Update the actuator documentation for Dynatrace to reflect the
updates and improvements that were made in Micrometer 1.9.0.

See gh-31132
 2022-06-10 12:34:05 -07:00
Moritz Halbritter 486b3073ce Add tracing in integration tests paragraph to the documentation 
See gh-31308
 2022-06-10 14:25:12 +02:00
Moritz Halbritter b250d8a1e4 Add @AutoConfigureObservability annotation 
This annotation is read by ObservabilityContextCustomizerFactory, which
then sets test properties depending on the annotation attributes.

@AutoConfigureMetrics is deprecated, to support backwards compatability
it's now meta-annotated with @AutoConfigureObservability

See gh-31308
 2022-06-10 14:25:12 +02:00
Andy Wilkinson 85ad4fd4b4 Merge branch '2.7.x' 
Closes gh-31212
 2022-05-30 17:17:26 +01:00
Andy Wilkinson 70bcade232 Merge branch '2.6.x' into 2.7.x 
Closes gh-31211
 2022-05-30 17:16:53 +01:00
Andy Wilkinson 419ac26e0d Use conventions for source and encoding of aggregatedJavadoc 
Closes gh-31210
 2022-05-30 17:15:45 +01:00
Stephane Nicoll a27427b977 Merge branch '2.7.x' 
Closes gh-31207
 2022-05-30 14:57:57 +02:00
Stephane Nicoll 95dad34482 Merge branch '2.6.x' into 2.7.x 
Closes gh-31206
 2022-05-30 14:57:45 +02:00
Matei Cernăianu eb8b9e17c5 Fix "spring.factories" typos in database initialization documentation 
See gh-31203
 2022-05-30 14:55:15 +02:00
Andy Wilkinson 90752e559a Polish "Auto-configure JvmCompilationMetrics" 
See gh-31151
 2022-05-27 10:18:31 +01:00
Andy Wilkinson 4bb5ba2bd0 Merge branch '2.7.x' 2022-05-26 18:26:52 +01:00
Andy Wilkinson 935d1264e0 Merge branch '2.6.x' into 2.7.x 2022-05-26 18:13:08 +01:00
Andy Wilkinson 3d203d0215 Polish 2022-05-26 17:30:39 +01:00
Andy Wilkinson 5dfa5adb75 Merge branch '2.7.x' 
Closes gh-31178
 2022-05-26 15:54:58 +01:00
Andy Wilkinson 455ee0ce22 Merge branch '2.6.x' into 2.7.x 
Closes gh-31177
 2022-05-26 15:53:38 +01:00
Andy Wilkinson ee45fd2fc8 Remove redundant throws declarations from internal APIs 
Closes gh-31176
 2022-05-26 15:47:35 +01:00
Andy Wilkinson 96c2d08fc4 Remove support for Solr as it is not compatible with Jetty 11 
Closes gh-31054
 2022-05-18 11:33:55 +01:00
Phillip Webb f8a41d34aa Merge branch '2.7.x' 2022-05-17 22:22:08 -07:00
Phillip Webb 23eceb0d8a Merge branch '2.6.x' into 2.7.x 2022-05-17 22:21:41 -07:00
Phillip Webb ea41e89c6c Merge branch '2.5.x' into 2.6.x 2022-05-17 22:21:10 -07:00
Phillip Webb 7d2f1bafc0 Update copyright year of changed files 2022-05-17 22:20:05 -07:00
Madhura Bhave c730ab7d0c Merge branch '2.7.x' into main 2022-05-17 14:29:36 -07:00
Scott Frederick 7d459a13c2 Add properties for SAML relying party single logout 
Closes gh-30128

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
 2022-05-17 14:07:48 -07:00
Andy Wilkinson a496cb9298 Merge branch '2.7.x' 2022-05-12 12:52:46 +01:00
Andy Wilkinson 2669f8c343 Merge branch '2.6.x' into 2.7.x 
Closes gh-30997
 2022-05-12 12:47:52 +01:00
Andy Wilkinson 655ceefead Merge branch '2.5.x' into 2.6.x 
Closes gh-30996
 2022-05-12 12:47:38 +01:00
Andy Wilkinson 3f6fcac683 Polish "Extend documentation on Datadog metrics" 
See gh-30879
 2022-05-12 12:36:50 +01:00
Denis Washington 09db7e4001 Extend documentation on Datadog metrics 
- Document that an application key must be set to publish metadata
  for the exported metrics.

- Point out that using a non-US Datadog site (e.g., EU) requires
  changing the `uri` property.

See gh-30879
 2022-05-12 12:36:18 +01:00
Andy Wilkinson c12171f2e9 Merge branch '2.7.x' 2022-05-12 12:28:20 +01:00
Andy Wilkinson 09b9a1f729 Merge branch '2.6.x' into 2.7.x 
Closes gh-30995
 2022-05-12 12:28:07 +01:00
Andy Wilkinson 9f46cf88c8 Merge branch '2.5.x' into 2.6.x 
Closes gh-30994
 2022-05-12 12:27:52 +01:00
颜虎 309e54bd21 Fix link to Upgrading From 1.x in multi-page documentation 
See gh-30890
 2022-05-12 12:15:30 +01:00
Andy Wilkinson 2744649892 Update started log message as app may not be running on a JVM 
Closes gh-30974
 2022-05-11 11:08:25 +01:00
Andy Wilkinson 770cb840c3 Use more flexible SpringFactoriesLoader 
Closes gh-30235

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
Co-authored-by: Stephane Nicoll <snicoll@vmware.com>
 2022-05-09 14:13:04 +01:00
Andy Wilkinson 0fbfb8ef09 Remove remnants of support for Embedded Mongo 
See gh-30863 and 7e089a6b
 2022-05-09 09:55:42 +01:00
Scott Frederick 7e089a6b81 Remove support for embedded MongoDB 
This commit removes auto-configuration and dependency management
for Flapdoodle embedded MongoDB in favor of the Spring Boot support
provided by Flapdoodle.

Closes gh-30863
 2022-05-06 17:05:36 -05:00
Andy Wilkinson 1ee079c265 Reinstate support for pooled-jms as it is now JMS 3.0 compatible 
Closes gh-30865
 2022-05-04 18:04:02 +01:00
Andy Wilkinson 0e00fafe38 Polish "Provide callback mechanism for customizing validation configuration" 
See gh-29429
 2022-05-04 11:45:39 +01:00
Scott Frederick 7f395941c7 Add timezone offset to default logging date format patterns 
Closes gh-28654
 2022-05-03 17:09:27 -05:00
Andy Wilkinson 541ab69aff Merge branch '2.7.x' 2022-05-03 15:18:20 +01:00
Andy Wilkinson 4cd850cfc0 Merge branch '2.6.x' into 2.7.x 
Closes gh-30851
 2022-05-03 15:17:13 +01:00
Andy Wilkinson fa327a783d Merge branch '2.5.x' into 2.6.x 
Closes gh-30850
 2022-05-03 15:14:00 +01:00
Eddú Meléndez f7a7e8cb89 Add auto-configuration for OtlpMeterRegistry 
See gh-30825
 2022-05-03 13:18:07 +01:00
izeye 77c3b6c899 Polish Micrometer tracing changes 
See gh-30833
 2022-05-03 11:39:31 +01:00
Eddú Meléndez 6a65aa4a23 Auto-configure Micrometer's JvmInfoMetrics 
See gh-30832
 2022-04-29 11:04:50 +01:00
Moritz Halbritter 85a4c94dea Merge branch '2.7.x' 2022-04-25 15:32:08 +02:00
Moritz Halbritter b406971094 Remove hyphen from asserting-party 
spring.security.saml2.relyingparty.registration.*.asserting-party.* is
now named spring.security.saml2.relyingparty.registration.*.assertingparty.*

Closes gh-30785
 2022-04-25 15:26:38 +02:00
Moritz Halbritter 35efc23deb Merge branch '2.7.x' 2022-04-25 09:15:39 +02:00
Moritz Halbritter e8b7843fe9 Merge branch '2.6.x' into 2.7.x 
Closes gh-30782
 2022-04-25 09:13:52 +02:00
Moritz Halbritter 63eb6b6ad9 Merge branch '2.5.x' into 2.6.x 
Closes gh-30781
 2022-04-25 09:13:34 +02:00
Moritz Halbritter 9b8b87009c Document support for Java 18 
Closes gh-30548
 2022-04-25 09:13:07 +02:00
Phillip Webb 7a6ca8ce25 Merge branch '2.7.x' 2022-04-20 15:30:01 -07:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Phillip Webb 36f1249fc6 Polish 2022-04-20 15:26:15 -07:00
Moritz Halbritter 1950d06585 Merge branch '2.7.x' 2022-04-20 08:26:35 +02:00
Moritz Halbritter 6c400daa48 Rename 'identityprovider' property to 'asserting-party' 
Rename spring.security.saml2.relyingparty.registration.*.identity-provider.*
to spring.security.saml2.relyingparty.registration.*.asserting-party.*

The old property names are still supported, but will lead to a warning
in the logs.

Closes gh-30642
 2022-04-20 08:25:58 +02:00
Stephane Nicoll 1698faffee Merge branch '2.7.x' 2022-04-20 08:24:32 +02:00
Stephane Nicoll 38c2a5c14b Merge branch '2.6.x' into 2.7.x 
Closes gh-30750
 2022-04-20 08:24:21 +02:00
Stephane Nicoll d049ae8703 Merge branch '2.5.x' into 2.6.x 
Closes gh-30749
 2022-04-20 08:24:07 +02:00
rfigueroa ae267bfab2 Use eclipse-temurin in docker samples 
As AdoptOpenJDK moved to the Eclipse Foundation, this commit updates the
docs to reflect that in docker file samples.

See gh-30748
 2022-04-20 08:21:55 +02:00
Stephane Nicoll 2d663f2e94 Upgrade to Spring Data 2021.2.0-RC1 
Closes gh-30610
 2022-04-20 08:05:15 +02:00
Brian Clozel 2dc2e5ab11 Auto-configure RSocketGraphQlClient 
This commit contributes a `RSocketGraphQlClient.Builder` component to
the context, pre-configured with the `RSocketStrategies`, a customized
`RSocketConnector` and the expected data MIME type.

See gh-30453
 2022-04-19 10:53:15 +02:00
Stephane Nicoll eb2f840446 Merge branch '2.7.x' 2022-04-19 09:55:40 +02:00
Stephane Nicoll 9c3cce58ea Merge branch '2.6.x' into 2.7.x 
Closes gh-30740
 2022-04-19 09:55:29 +02:00
Stephane Nicoll 57b3cb5135 Polish "Fix incorrect link in kafka.adoc" 
See gh-30674
 2022-04-19 09:52:56 +02:00
Chanhyeong Cho 577f0add0c Fix incorrect link in kafka.adoc 
See gh-30674
 2022-04-19 09:48:03 +02:00
Stephane Nicoll a4cccc98c6 Merge branch '2.7.x' 2022-04-19 09:37:08 +02:00
izeye ed412af138 Polish 
See gh-30695
 2022-04-19 09:34:28 +02:00
Stephane Nicoll 2ce840986f Merge branch '2.7.x' 2022-04-19 09:25:41 +02:00
Stephane Nicoll 4c5cb772ff Polish 
See gh-30674
 2022-04-19 09:25:02 +02:00
Brian Clozel eddb2b16ff Configure RSocket server support in GraphQL 
This commit adds the RSocket server auto-configuration for GraphQL.

See gh-30453
 2022-04-14 19:54:40 +02:00
Moritz Halbritter 3860eb211a Implement auto-configurations for Brave and OpenTelemetry 
- Configure Zipkin
- Configure Wavefront
- Configure Brave
- Configure OpenTelemetry
- Configure Micrometer Tracing bridges for OpenTelemetry and Brave
- Create the ObservationHandler for tracing with Micrometer

Closes gh-30156
 2022-04-14 09:14:44 +02:00
Scott Frederick f5f7fc8e9a Merge branch '2.7.x' 2022-04-13 16:29:00 -05:00
Scott Frederick d387b3fa81 Support configuration of web SSL using PEM-encoded certificates 
This commit adds the ability to configure SSL in embedded web containers
using PEM-encoded certificate and private key files, as an alternative
to configuring SSL with Java KeyStore files.

Closes gh-29273
 2022-04-13 16:28:04 -05:00
Andy Wilkinson 258ae5e153 Merge branch '2.7.x' 2022-04-12 21:58:41 +01:00
Andy Wilkinson 562627fb42 Deprecate auto-configuration for RestHighLevelClient 
Closes gh-28598
 2022-04-12 21:58:08 +01:00
Andy Wilkinson d5a92ccb8b Merge branch '2.7.x' 2022-04-12 21:20:34 +01:00
Andy Wilkinson a7a71da9ef Polish "Bring back Elasticsearch RestClient auto-configuration" 
See gh-28496
 2022-04-12 21:13:05 +01:00
Filip Hrisafov eb3bf40bdb Bring back Elasticsearch RestClient auto-configuration 
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed.

This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.

The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.

The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.

See gh-28496

[1] https://github.com/elastic/elasticsearch-java
 2022-04-12 21:13:05 +01:00
Brian Clozel e57bbdfcf5 Polish 
See gh-29666
 2022-04-12 18:41:01 +02:00
Andy Wilkinson 44211564a4 Adapt to latest changes in Micrometer 2.0 snapshots 
See gh-29666
 2022-04-12 15:25:43 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots 
See gh-30605
 2022-04-12 11:47:34 +01:00
Andy Wilkinson b871a1e457 Merge branch '2.7.x' 2022-04-12 08:51:47 +01:00
Andy Wilkinson 48f8021d88 Migrate @Local*Port annotations to spring-boot-test 
Closes gh-29589
 2022-04-12 08:48:43 +01:00
Andy Wilkinson 2dcc1ea257 Merge branch '2.7.x' 2022-04-07 20:44:38 +01:00
Andy Wilkinson 612e4114d2 Merge branch '2.6.x' into 2.7.x 
Closes gh-30584
 2022-04-07 20:44:29 +01:00
Andy Wilkinson f027faafa2 Merge branch '2.5.x' into 2.6.x 
Closes gh-30583
 2022-04-07 20:44:10 +01:00
izeye 618d113fad Move Jetty 9 specific exclusions to correct dependency 
See gh-30522
 2022-04-07 20:41:42 +01:00
Andy Wilkinson e6b485b317 Merge branch '2.7.x' 2022-04-07 16:31:58 +01:00
Andy Wilkinson 8727361221 Polish "Order ExitCodeGenerators and return first non-zero exit code" 
See gh-30457
 2022-04-07 16:31:19 +01:00
dugenkui 6718b10fa9 Order ExitCodeGenerators and return first non-zero exit code 
See gh-30457
 2022-04-07 16:30:09 +01:00
Andy Wilkinson a70249e368 Merge branch '2.7.x' 2022-04-05 15:11:41 +01:00
Andy Wilkinson ffc0fafe1a Merge branch '2.6.x' into 2.7.x 
Closes gh-30545
 2022-04-05 15:11:25 +01:00
Andy Wilkinson 05d4093381 Merge branch '2.5.x' into 2.6.x 
Closes gh-30544
 2022-04-05 15:11:01 +01:00
Andy Wilkinson 83cfc951f8 Polish "Refer to list of internal proxies in reference documentation" 
See gh-30461
 2022-04-05 14:37:08 +01:00
Damiano Albani 91306b58d5 Refer to list of internal proxies in reference documentation 
See gh-30461
 2022-04-05 14:34:37 +01:00
Moritz Halbritter 5b05fd9fb2 Merge branch '2.7.x' 2022-04-04 14:27:24 +02:00
Moritz Halbritter eedb8573b7 Polish documentation 2022-04-04 14:27:18 +02:00
Moritz Halbritter 6fa696f13d Merge branch '2.7.x' 2022-04-04 14:23:24 +02:00
Moritz Halbritter bd1424b004 Merge branch '2.6.x' into 2.7.x 
Closes gh-30528
 2022-04-04 14:22:49 +02:00
Moritz Halbritter bf3c2d713d Merge branch '2.5.x' into 2.6.x 
Closes gh-30526
 2022-04-04 14:18:45 +02:00
izeye 09d6215b65 Polish documentation 
See gh-30498
 2022-04-04 14:09:28 +02:00
Moritz Halbritter 9791318e55 Merge branch '2.7.x' 2022-04-04 13:49:05 +02:00
Jonatan Ivanov d0bc31a5e9 Add support for Prometheus Exemplars 
See gh-30472
 2022-04-04 13:35:38 +02:00
Andy Wilkinson 24e6417ddc Adapt to latest changes in Spring for GraphQL snapshots 
See gh-30463
 2022-03-29 16:50:12 +01:00
Andy Wilkinson 5d8c1d9bd7 Merge branch '2.7.x' 2022-03-29 14:30:42 +01:00
Andy Wilkinson 2f3ae02385 Merge branch '2.6.x' into 2.7.x 
Closes gh-30466
 2022-03-29 14:24:42 +01:00
Andy Wilkinson 8f985474a6 Merge branch '2.5.x' into 2.6.x 
Closes gh-30465
 2022-03-29 14:24:25 +01:00
Andy Wilkinson d574563616 Document @ConstructorBinding and @DefaultValue with records 
Closes gh-30460
 2022-03-29 14:14:28 +01:00
Moritz Halbritter be3523b1cd Move metric properties 
- Moved from 'management.metrics.export.<product>' to
  'management.<product>.metrics.export'
- The default enabled property moved from 'management.metrics.export.defaults.enabled'
  to 'management.defaults.metrics.export.enabled'

Closes gh-30381
 2022-03-28 08:24:03 +02:00
Andy Wilkinson eabf6cd1d8 Merge branch '2.7.x' 2022-03-25 15:15:26 +00:00
Andy Wilkinson 685d2d4391 Polish 
See gh-30152
 2022-03-25 15:15:02 +00:00
Andy Wilkinson 2e32f800e1 Merge branch '2.7.x' 2022-03-25 13:34:37 +00:00