Phillip Webb
d8b6960997
Merge branch '2.4.x'
...
Closes gh-25077
2021-02-01 16:08:57 -08:00
Phillip Webb
257608a3a3
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25076
2021-02-01 16:03:43 -08:00
Phillip Webb
939b5dfc26
Add junit-platform-launcher dependency
...
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.
Closes gh-25074
2021-02-01 15:31:28 -08:00
Madhura Bhave
c73e3cc2dc
Update documentation for layered wars
...
Closes gh-22821
Closes gh-22195
2021-02-01 14:43:43 -08:00
Phillip Webb
0104ee677e
Merge branch '2.4.x'
...
Closes gh-25067
2021-01-30 17:58:05 -08:00
Phillip Webb
57f1f17320
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25066
2021-01-30 17:57:53 -08:00
Phillip Webb
187258aa6a
Fix classpath.idx format documentation
...
Since 2.3.8 and 2.4.2 the format includes the directory.
Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb
d6eb1eb5ae
Merge branch '2.4.x'
...
Closes gh-25065
2021-01-30 17:46:25 -08:00
Phillip Webb
9ac5151932
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25064
2021-01-30 17:46:10 -08:00
Phillip Webb
19c5864d2c
Clarify square bracket map binding notation
...
Update reference docs to make it clearer when the square bracket map
binding notation should be used.
Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb
99d400f302
Merge branch '2.4.x'
...
Closes gh-25062
2021-01-30 17:04:24 -08:00
Phillip Webb
d7c44e4503
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25061
2021-01-30 17:04:10 -08:00
Phillip Webb
549d4f7fbe
Document that Spring MVC has own ConversionService
...
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.
Closes gh-22718
2021-01-30 17:03:55 -08:00
Andy Wilkinson
82b90d5749
Merge branch '2.4.x'
...
Closes gh-25052
2021-01-29 09:07:40 +00:00
Andy Wilkinson
a3058200cb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25050
2021-01-29 09:06:42 +00:00
dreis2211
4940694db2
Fix duplicate anchor id
...
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb
f6097e7da4
Merge branch '2.4.x'
...
Closes gh-25045
2021-01-28 19:29:14 -08:00
Phillip Webb
2d056525d8
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25044
2021-01-28 19:28:56 -08:00
Phillip Webb
c03d8773e7
Improve logging.register-shutdown-hook docs
...
Update the "Logging" reference documentation with a section about
shutting down the logging system.
Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb
479180fdf9
Merge branch '2.4.x'
...
Closes gh-25041
2021-01-28 18:49:04 -08:00
Phillip Webb
c86ee4c851
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25040
2021-01-28 18:48:51 -08:00
Phillip Webb
5b2d1f19a0
Polish 'Add note about exploded jars and banner properties'
...
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith
33c038199d
Add note about exploded jars and banner properties
...
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.
See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb
802da9dc87
Merge branch '2.4.x'
...
Closes gh-25039
2021-01-28 18:01:06 -08:00
Phillip Webb
53f1aab833
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25038
2021-01-28 18:00:42 -08:00
Phillip Webb
60bb33f231
Polish 'Add a tip about actuator endpoints'
...
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang
6ced1d7f4e
Add a tip about actuator endpoints
...
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.
See gh-24336
2021-01-28 17:53:04 -08:00
Hatef Palizgar
53c1e79810
Change info endpoint to be secure and unexposed by default
...
See gh-24715
2021-01-21 13:54:59 -08:00
dreis2211
d4eccb7715
Upgrade to Groovy 3.0.7
...
See gh-24946
2021-01-21 14:32:42 +00:00
Stephane Nicoll
012a199773
Remove Spring Data Solr support
...
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.
Closes gh-24939
2021-01-20 15:03:42 +01:00
Stephane Nicoll
85729d2a8a
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24943
2021-01-20 13:57:18 +01:00
Stephane Nicoll
10b4cb8cb5
Deprecate Spring Data Solr support
...
Closes gh-24942
2021-01-20 13:56:50 +01:00
Stephane Nicoll
600be08225
Merge branch '2.4.x'
...
Closes gh-24855
2021-01-15 16:51:27 +01:00
Stephane Nicoll
7ec7569939
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24854
2021-01-15 16:51:10 +01:00
Stephane Nicoll
b3ab77a5c3
Move Spring Boot version to main index in reference guide
...
Closes gh-24848
2021-01-15 16:50:45 +01:00
Stephane Nicoll
1a2a3d6598
Merge branch '2.4.x'
2021-01-15 14:37:25 +01:00
Stephane Nicoll
e8ae18ae11
Polish
...
See gh-24837
2021-01-15 14:36:53 +01:00
Stephane Nicoll
a18f01addf
Remove bitronix support
...
See gh-24806
2021-01-15 14:14:27 +01:00
Brian Clozel
4dd60684c9
Merge branch '2.4.x'
...
Closes gh-24844
2021-01-14 18:36:31 +01:00
Brian Clozel
6f51831001
Fix docs on probe state during graceful shutdown
...
This commit improves the "Application lifefycle and Probes states"
section and underlines the difference between `AvailabilityState` and
the availability of Probes over HTTP.
Closes gh-24843
2021-01-14 18:30:15 +01:00
Stephane Nicoll
0897af0dfa
Add customizer for jOOQ's configuration
...
This commit adds a customizer hook point for jOOQ's configuration. When
such a bean is present, it is invoked with the auto-configuration
`Configuration`. This effectively supersedes checking for a number of
jOOQ `*Provider`beans. The existing beans are still honoured, in a
deprecated fashion.
Closes gh-24732
2021-01-11 14:16:34 +01:00
Stephane Nicoll
1d30a4716e
Merge branch '2.4.x'
...
Closes gh-24708
2021-01-08 15:54:36 +01:00
Stephane Nicoll
b8a1869569
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24707
2021-01-08 15:53:53 +01:00
Stephane Nicoll
826d79be3e
Clarify behaviour of WebServerFactory in reference guide
...
Closes gh-24705
2021-01-08 15:50:16 +01:00
Phillip Webb
42e649debe
Merge branch '2.4.x'
...
Closes gh-24682
2021-01-06 16:47:46 -08:00
Phillip Webb
04616a01cf
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24681
2021-01-06 16:47:24 -08:00
Phillip Webb
ef09982b39
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24680
2021-01-06 16:46:50 -08:00
Phillip Webb
25033ee5e7
Migrate away from pivotal-legacy/homebrew-tap
...
Update reference documentation to the new spring-io/homebrew-tap repo.
Closes gh-24659
2021-01-06 16:45:10 -08:00
Stephane Nicoll
2547a9e255
Merge branch '2.4.x'
...
See gh-24655
2021-01-06 14:24:34 +01:00
Stephane Nicoll
c014bb9880
Merge branch '2.3.x' into 2.4.x
...
See gh-24647
2021-01-06 14:24:13 +01:00
Stephane Nicoll
67d1f355d7
Fix Nullable reference
...
See gh-24647
2021-01-06 14:23:38 +01:00
Stephane Nicoll
b3278f459e
Merge branch '2.4.x'
...
See gh-24655
2021-01-06 08:59:14 +01:00
Stephane Nicoll
4e6f15a466
Merge branch '2.3.x' into 2.4.x
...
See gh-24647
2021-01-06 08:58:48 +01:00
Stephane Nicoll
2bd78355dc
Reference javax.annotation.Nonnull support in reference guide
...
See gh-24647
2021-01-06 08:58:13 +01:00
Andy Wilkinson
77652961cd
Merge branch '2.4.x'
...
Closes gh-24650
2021-01-05 17:13:45 +00:00
Andy Wilkinson
89f29c933f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24649
2021-01-05 17:13:30 +00:00
dreis2211
fe3217d2c4
Exclude starters from Javadoc aggregation
...
See gh-24648
2021-01-05 17:12:39 +00:00
Stephane Nicoll
63444ae957
Merge branch '2.4.x'
...
Closes gh-24627
2021-01-01 09:18:31 +01:00
Stephane Nicoll
052565ef2b
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24626
2021-01-01 09:18:13 +01:00
dreis2211
261b7a5b18
Update copyrights to 2021
...
See gh-24625
2021-01-01 09:17:13 +01:00
Stephane Nicoll
1a2577a07e
Fix sample formatting
2020-12-23 17:19:18 +01:00
Stephane Nicoll
1fd17cf641
Add support for Elasticsearch sniffer
...
Closes gh-24174
2020-12-23 17:11:40 +01:00
Stephane Nicoll
1e8d5c37ed
Merge branch '2.4.x'
...
Closes gh-24607
2020-12-23 16:09:13 +01:00
izeye
5e3f618f9d
Polish
...
See gh-24604
2020-12-23 16:08:21 +01:00
Stephane Nicoll
e3d7ab0e3b
Merge branch '2.3.x' into 2.4.x
2020-12-23 16:08:08 +01:00
Stephane Nicoll
d0a1c49873
Polish
...
See gh-24604
2020-12-23 16:07:27 +01:00
Madhura Bhave
b29ac37db6
Add docs about using InMemoryOAuth2AuthorizedClientService
...
Closes gh-24596
2020-12-22 12:18:47 -08:00
Madhura Bhave
d36c950e33
Merge branch '2.4.x'
...
Closes gh-24595
2020-12-22 12:14:16 -08:00
Madhura Bhave
a0afec120d
Add docs about using InMemoryOAuth2AuthorizedClientService
...
Closes gh-24313
2020-12-22 12:13:17 -08:00
Madhura Bhave
467f853641
Merge branch '2.4.x'
...
Closes gh-24593
2020-12-22 11:17:54 -08:00
Madhura Bhave
a714ba44ea
Update documentation containing examples of WebSecurityConfigurerAdapter
...
Closes gh-24551
2020-12-22 11:17:30 -08:00
Stephane Nicoll
1f71927a9f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24587
2020-12-22 09:45:42 +01:00
Stephane Nicoll
9e5a6c5228
Harmonize references to ActiveMQ Artemis
...
Closes gh-24586
2020-12-22 09:44:49 +01:00
Justin Bertram
99b43cb690
Allow to configure ActiveMQ Artemis with a broker url
...
See gh-24302
2020-12-21 17:32:49 +01:00
Madhura Bhave
13a06e4eca
Merge branch '2.4.x'
2020-12-18 18:03:45 -08:00
Madhura Bhave
af67e6fa54
Merge branch '2.3.x' into 2.4.x
2020-12-18 18:03:22 -08:00
Madhura Bhave
b82f5a408a
Add a note about disabling git info
...
See gh-24205
2020-12-18 18:02:27 -08:00
Madhura Bhave
15a56f81df
Merge branch '2.4.x'
...
Closes gh-24573
2020-12-18 17:27:13 -08:00
Madhura Bhave
f9d1a4526c
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24572
2020-12-18 17:26:44 -08:00
Madhura Bhave
a5c8b84511
Update version of git-properties plugin in the docs
...
Closes gh-24567
2020-12-18 17:25:26 -08:00
Madhura Bhave
acbe18cf85
Merge branch '2.4.x'
...
Closes gh-24571
2020-12-18 17:15:26 -08:00
Madhura Bhave
c231f3da10
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24570
2020-12-18 17:15:01 -08:00
Madhura Bhave
302ba77812
Improve documentation regarding git commit info
...
Closes gh-24205
2020-12-18 17:13:30 -08:00
Phillip Webb
07348066e3
Merge branch '2.4.x'
2020-12-18 15:10:00 -08:00
Phillip Webb
f568aa489c
Fixup title anchors
2020-12-18 15:06:11 -08:00
Madhura Bhave
9aa1b528df
Merge branch '2.4.x'
...
Closes gh-24566
2020-12-18 14:17:12 -08:00
Madhura Bhave
01537bc54f
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24565
2020-12-18 14:16:45 -08:00
Madhura Bhave
c9a09cf6a9
Clarify when SpEL expressions in application properties are evaluated
...
Closes gh-24531
2020-12-18 14:15:27 -08:00
Madhura Bhave
86d64c727d
Merge branch '2.4.x'
...
Closes gh-24564
2020-12-18 14:05:49 -08:00
Madhura Bhave
55d9951d90
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24563
2020-12-18 14:05:20 -08:00
Madhura Bhave
1db271c2c5
Reorder documentation about building images
...
Closes gh-24560
2020-12-18 14:02:29 -08:00
Andy Wilkinson
4040105629
Merge branch '2.4.x'
...
Closes gh-24519
2020-12-15 17:22:01 +00:00
Andy Wilkinson
a67edfbeb7
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24518
2020-12-15 17:21:39 +00:00
Andy Wilkinson
76198f9a8d
Include properties from test-autoconfigure in config props appendix
...
Closes gh-24486
2020-12-15 17:20:21 +00:00
Andy Wilkinson
fb0f27ce2d
Move EMFDependsOnPostProcessor into autoconfigure.orm.jpa
...
Closes gh-24452
2020-12-15 14:20:50 +00:00
Stephane Nicoll
69c6b6b04d
Merge branch '2.4.x'
...
Closes gh-24511
2020-12-15 14:48:38 +01:00
Stephane Nicoll
251e8b2640
Update instruction to add the configuration processor with Maven
...
Closes gh-24498
2020-12-15 14:48:19 +01:00
Stephane Nicoll
f9e44cd774
Merge branch '2.4.x'
...
Closes gh-24496
2020-12-14 16:20:11 +01:00
Stephane Nicoll
96510156ae
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24495
2020-12-14 16:19:50 +01:00
Stephane Nicoll
26e7e61919
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24494
2020-12-14 16:19:23 +01:00
Stephane Nicoll
60f526add0
Remove links to Jetty API and documentation
...
This commit removes links to Jetty API and documentation as those links
are breaking every time the Jetty team releases a new version
See https://github.com/eclipse/jetty.project/issues/4546
Closes gh-24493
2020-12-14 16:17:25 +01:00
Stephane Nicoll
08b692581a
Prepare 2.4.x branch
2020-12-14 14:22:07 +01:00
izeye
0eae6b4f72
Polish
...
See gh-24418
2020-12-10 13:53:06 +01:00
Phillip Webb
b48f4028a3
Merge branch '2.3.x'
2020-12-08 16:32:45 -08:00
Phillip Webb
30717b6ae3
Merge branch '2.2.x' into 2.3.x
2020-12-08 16:32:26 -08:00
Phillip Webb
4f95486822
Polish note about Maven/Gradle restarts
...
See gh-24271
2020-12-08 16:31:46 -08:00
Phillip Webb
b9e87a4ab2
Merge branch '2.3.x'
...
Closes gh-24410
2020-12-08 16:25:16 -08:00
Phillip Webb
445c6b8aa6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24409
2020-12-08 16:25:03 -08:00
Phillip Webb
10d3121e27
Polish "Triggering a restart" formatting
...
See gh-24271
2020-12-08 16:24:18 -08:00
Billy T. Hernandez
0503079dc5
Document devtools restart with Maven/Gradle
...
Update the documentation to help avoid confusion for people who aren't
using an IDE.
See gh-24271
2020-12-08 16:20:32 -08:00
Phillip Webb
3618bddf51
Merge branch '2.3.x'
...
Closes gh-24408
2020-12-08 16:15:31 -08:00
Phillip Webb
06531b9b71
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24407
2020-12-08 16:08:32 -08:00
Phillip Webb
89642f0ce8
Add link to appendix from error handling
...
Improve documentation by adding a link from the "Error Handling" section
to the appendix.
Closes gh-24265
2020-12-08 16:06:21 -08:00
Phillip Webb
cd5ff6e4af
Merge branch '2.3.x'
...
Closes gh-24404
2020-12-08 12:13:02 -08:00
Phillip Webb
11f285bde5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24403
2020-12-08 12:12:51 -08:00
izeye
8c55803931
Polish
...
See gh-24306
2020-12-08 12:08:35 -08:00
Stephane Nicoll
93d83342d2
Merge branch '2.3.x'
...
Closes gh-24401
2020-12-08 15:42:52 +01:00
Stephane Nicoll
06671aa50e
Stop deferring JPA bootstrap mode by default
...
This commit changes the default value of bootstrap-mode to "default"
rather than "deferred" so that the JPA infrastructure starts in the
main thread rather than asynchronously.
Closes gh-24249
2020-12-08 15:42:14 +01:00
dreis2211
b9ec88a7a5
Fix Asciidoc build step
...
See gh-24326
2020-12-03 16:30:16 -08:00
Madhura Bhave
d041c7d6b9
Document the granularity for property document imports
...
Closes gh-22987
2020-12-03 12:17:53 -08:00
Madhura Bhave
932fb65107
Correct external application properties load order
...
Fixes gh-24308
2020-12-03 11:55:51 -08:00
Stephane Nicoll
f3afd8a0f4
Fix location of Spring LDAP and Spring Session properties
...
Closes gh-23558
2020-11-18 10:28:54 +01:00
Stephane Nicoll
7283ff04eb
Merge branch '2.3.x'
...
Closes gh-24162
2020-11-16 07:21:19 +01:00
Sergey Kolesnikov
b341b478a6
Rename "sla" to "slo" in reference documentation
...
See gh-24160
2020-11-16 07:20:23 +01:00
Andy Wilkinson
6df10842d2
Allow Devtools to be enabled irrespective of the launching ClassLoader
...
Closes gh-21424
2020-11-12 13:22:40 +00:00
Andy Wilkinson
368b40868f
Merge branch '2.3.x'
...
Closes gh-24122
2020-11-11 20:16:51 +00:00
Andy Wilkinson
3e243de41b
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24121
2020-11-11 20:16:39 +00:00
dreis2211
033c78b945
Fix link to Flyway callback docs
...
See gh-24119
2020-11-11 20:14:08 +00:00
Brian Clozel
f0a6128db3
Add spring.web.resources.cache.use-last-modified
...
Prior to this commit, packaging a Spring Boot application as a container
image with Cloud Native Buildpacks could result in unwanted browser
caching behavior, with "Last-Modified" HTTP response headers pointing to
dates in the far past.
This is due to CNB resetting the last-modified date metadata for static
files (for build reproducibility and container layer caching) and Spring
static resource handling relying on that information when serving static
resources.
This commit introduces a new configuration property
`spring.web.resources.cache.use-last-modified` that can be used to
disable this behavior in Spring if the application is meant to run as a
container image built by CNB.
The default value for this property remains `true` since this remains
the default value in Spring Framework and using that information in
other deployment models is a perfectly valid use case.
Fixes gh-24099
2020-11-10 13:40:25 +01:00
Andy Wilkinson
6a2332d477
Merge branch '2.3.x'
...
Closes gh-24062
2020-11-05 15:55:09 +00:00
Andy Wilkinson
44d0ce5ff1
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24060
2020-11-05 15:53:53 +00:00
Andy Wilkinson
9c5d1646bd
Show how to configure a case-sensitive physical naming strategy
...
Closes gh-24045
2020-11-05 15:53:32 +00:00
Andy Wilkinson
bb5faeaabe
Correct cross-reference in reference documentation
...
See gh-24033
2020-11-04 21:09:10 +00:00
Andy Wilkinson
21eb46739c
Merge branch '2.3.x'
...
Closes gh-24033
2020-11-04 17:45:30 +00:00
Andy Wilkinson
84cee76700
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24032
2020-11-04 17:42:24 +00:00
Andy Wilkinson
d5980be623
Clarify documentation for relaxed binding of environment variables
...
Closes gh-22974
2020-11-04 17:40:27 +00:00
Andy Wilkinson
a1af99640e
Merge branch '2.3.x'
...
Closes gh-24026
2020-11-04 10:15:26 +00:00
Andy Wilkinson
28f7bc37a5
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24025
2020-11-04 10:15:07 +00:00
Andy Wilkinson
c289ba0c2c
Recommend disabling context root redirects with proxied Tomcat
...
Closes gh-22908
2020-11-04 10:13:55 +00:00
Andy Wilkinson
2814f91fbf
Merge branch '2.3.x'
...
Closes gh-24022
2020-11-03 20:33:08 +00:00
Andy Wilkinson
7c209478b6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24021
2020-11-03 20:32:57 +00:00
Pascal Schumacher
5472fcf433
Fix typo in Spring Session documentation
...
See gh-24020
2020-11-03 20:31:42 +00:00
Andy Wilkinson
6cb5a98036
Merge branch '2.3.x'
...
Closes gh-24019
2020-11-03 19:43:28 +00:00
Andy Wilkinson
b2a058b6fe
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24018
2020-11-03 19:43:15 +00:00
Andy Wilkinson
2f280b01e1
Improve Spring Session back-off documentation
...
Closes gh-23151
2020-11-03 19:42:57 +00:00
Andy Wilkinson
73c444262b
Merge branch '2.3.x'
...
Closes gh-24015
2020-11-03 16:38:49 +00:00
Andy Wilkinson
f9ff39a7a6
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24014
2020-11-03 16:38:33 +00:00
Andy Wilkinson
35bff55097
Ensure that Quartz can be auto-configured with a Quartz-specific TM
...
Previously, Quartz could be configured with a specific DataSource
using `@QuartzDataSource` but it was not possible to configure a
Quartz-specific transaction manager. This could result in the
different DataSources being used by Quartz itself and Quart'z
DataSourceTransactionManager.
This commit introduces a new qualifier, `@QuartzTransactionManager`,
that can be used to avoid the above-described problem. Any
`@QuartzTransactionManager`-annotated bean will be used by the
Quartz auto-configure configuration instead of the application's main
`TransactionManager`. If no such qualified bean is present, the
application's main TransactionManager, if any, will be used as before.
Fixes gh-20184
2020-11-03 15:56:44 +00:00
Andy Wilkinson
c76b246463
Merge branch '2.3.x'
...
Closes gh-24005
2020-11-03 10:17:17 +00:00
Andy Wilkinson
b846143c37
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24004
2020-11-03 10:17:00 +00:00