Johnny Lim
5eeb429e44
Polish
...
See gh-33966
2023-01-31 10:48:30 +01:00
Phillip Webb
71efc55bf9
Merge branch '2.7.x'
2023-01-18 16:31:53 -08:00
Phillip Webb
7c508fa324
Update copyright year of changed files
2023-01-18 15:37:58 -08:00
Moritz Halbritter
94f4a4396c
Merge branch '2.7.x'
...
Closes gh-33880
2023-01-18 17:35:52 +01:00
Moritz Halbritter
e8d809fe65
Replace 'via' with 'over' or 'through' in the documentation
...
Closes gh-33878
2023-01-18 16:56:42 +01:00
Phillip Webb
a889c539ab
Merge branch '2.7.x'
2023-01-17 10:12:25 -08:00
Phillip Webb
a0fe8241a7
Update copyright year of changed files
2023-01-17 10:07:03 -08:00
Phillip Webb
2cdd071775
Update getting started documentation to use @SpringBootApplication
...
Closes gh-32795
2023-01-12 10:09:33 +01:00
Phillip Webb
0254619782
Merge branch '2.7.x'
2022-12-22 00:59:40 -08:00
Phillip Webb
e4772cf3b7
Update copyright year of changed files
2022-12-22 00:59:32 -08:00
Moritz Halbritter
725337f976
Make fields final
...
Closes gh-33537
2022-12-16 14:28:44 +01:00
Moritz Halbritter
26db0c7120
Merge branch '2.7.x'
2022-11-23 17:25:07 +01:00
Moritz Halbritter
2170941cf6
Update Kotlin example for Tomcat connector customization
...
See gh-33331
2022-11-23 17:10:36 +01:00
Moritz Halbritter
9af2a5712c
Merge branch '2.6.x' into 2.7.x
...
Closes gh-33331
2022-11-23 17:01:19 +01:00
Moritz Halbritter
b00f4f926a
Create a HTTP connector in the custom tomcat connector example
...
Closes gh-28707
2022-11-23 17:00:08 +01:00
Andy Wilkinson
cb14089d24
Align reference docs with @Timed changes
...
Closes gh-33282
2022-11-21 14:14:28 +00:00
Moritz Halbritter
517ec654ed
Document @NestedConstructorBinding in all cases
...
This covers Kotlin data classes, constructor injection and records.
Closes gh-33235
2022-11-18 11:43:12 +01:00
Moritz Halbritter
5a88468c09
Refine example to show @NestedConfigurationProperty usage
...
Closes gh-33239
2022-11-18 10:25:30 +01:00
Moritz Halbritter
5c10ae2f0b
Revert "Remove unneeded NestedConfigurationProperty"
...
This reverts commit 8048e2d6c2
.
2022-11-18 10:23:09 +01:00
Moritz Halbritter
8048e2d6c2
Remove unneeded NestedConfigurationProperty
...
Closes gh-33239
2022-11-18 09:45:55 +01:00
Phillip Webb
2c193e7736
Remove legacy cookie processor documentation
...
Remove legacy processor documentation since support will be removed
in Tomcat 10.1.
Closes gh-33021
2022-11-05 18:50:33 -07:00
Moritz Halbritter
5d1ff17a0a
Add Micrometer Observability documentation
...
Closes gh-32833
Closes gh-32912
2022-10-31 09:47:16 +01:00
Phillip Webb
4be3218cb6
Merge branch '2.7.x'
2022-10-25 15:48:26 -07:00
Moritz Halbritter
ff6d9aa881
Polish "Add micrometer tracing documentation"
2022-10-21 14:51:19 +02:00
Moritz Halbritter
e999513838
Add micrometer tracing documentation
...
Closes gh-30658
2022-10-21 10:04:40 +02:00
Stephane Nicoll
74a8eb7160
Merge branch '2.7.x'
...
Closes gh-32819
2022-10-20 16:40:30 +02:00
Stephane Nicoll
13691f27bd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32818
2022-10-20 16:37:57 +02:00
Stephane Nicoll
4d7cb7144e
Upgrade copyright year of changed files
...
See gh-32644
2022-10-20 16:35:55 +02:00
Ada-Claire
c5a1944267
Harmonize ConfigurationProperties code samples
...
Rename the SomeProperties class so that it is consistent with other
examples given within the Type-safe Configuration Properties. This
ensures that readers can intuitively draw the conclusion that the
MyProperties class is annotated with ConfigurationProperties.
See gh-32644
2022-10-20 16:35:18 +02:00
Phillip Webb
73a34b6c0a
Fix checkstyle issues
...
See gh-32582
2022-10-20 00:09:07 -07:00
Phillip Webb
fb736e8427
Add native image reference documentation
...
Update reference documentation with a new "native image" section.
This commit includes some work derived from the "Spring Native"
project documentation written by Andy Clement, Sébastien Deleuze,
Filip Hanik, Dave Syer, Esteban Ginez, Jay Bryant, Brian Clozel,
Stéphane Nicoll, and Josh Long.
Closes gh-32582
Co-authored-by: Moritz Halbritter <mkammerer@vmware.com>
2022-10-19 23:46:21 -07:00
Madhura Bhave
ce3c933f77
Adapt to Spring Security changes
...
Closes gh-32604
2022-10-19 11:46:27 -07:00
Phillip Webb
43a44006c9
Update getting started documentation to use @SpringBootApplication
...
Closes gh-32780
2022-10-18 20:45:23 -07:00
Brian Clozel
d25fc73dae
Upgrade to Neo4J Java Driver 5.0.0
...
Closes gh-32620
2022-10-06 19:46:31 +02:00
Brian Clozel
a0735eb3fb
Migrate remaining usage of httpclient API
...
This commit migrates our remaining usage of the httpclient 4.x to use
instead httpclient5, now that the 4.x support has been removed in
`RestTemplate`.
Closes gh-32461
2022-09-29 18:55:42 +02:00
Stephane Nicoll
fcafd2abdb
Merge branch '2.7.x'
...
Closes gh-32516
2022-09-27 09:00:57 +02:00
Stephane Nicoll
cb191dfec2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-32515
2022-09-27 08:59:11 +02:00
heqiang
5db6cc1cba
Remove redundant @ExtendWith(SpringExtension.class) for sample
...
See gh-32476
2022-09-27 08:49:46 +02:00
Vedran Pavic
230f2cda84
Migrate to AuthorizationFilter in Spring Security auto-config
...
This commit updates Servlet based Spring Security auto-configuration
to use AuthorizationFilter, which is intended to supersede
FilterSecurityInterceptor.
See gh-31255
2022-09-22 13:53:54 +01:00
Phillip Webb
7f5785182d
Switch @SpringBootTest to UseMainMethod.NEVER by default
...
See gh-22405
2022-09-15 12:37:26 -07:00
Phillip Webb
41e0bbf4bb
Add SpringBootTest.useMainMethod support
...
Add a new `useMainMethod` attribute to `SpringBootTest` which can be
used to determine how the test should run. The three available options
are:
- `ALWAYS`
- `NEVER`
- `WHEN_AVAILABLE`
The default is `WHEN_AVAILABLE` which will attempt to launch the test
using the `main` method if there is one.
The `SpringBootContextLoader` has been updated to use the new
`SpringApplicationHook` interface when the main method is being used.
Closes gh-22405
2022-09-14 22:37:37 -07:00
Andy Wilkinson
0555dda63d
Remove rarely used commands from the CLI
...
Closes gh-32263
2022-09-08 21:23:33 +01:00
Andy Wilkinson
4c01810ca2
Merge branch '2.7.x'
...
Closes gh-32197
2022-08-31 11:37:20 +01:00
Andy Wilkinson
13edfba1f5
Fix Kotlin example for empty @DefaultValue constructor binding
...
Closes gh-32177
2022-08-31 11:35:58 +01:00
Andy Wilkinson
ba93e6c0ed
Restore support for Jersey
...
Closes gh-28637
2022-08-08 15:45:20 +01:00
Brian Clozel
184945ab1e
Fix graphql imports in reference docs generation
...
See gh-31809
2022-08-01 15:27:36 +02:00
Brian Clozel
38f1bc9793
Reinstate Spring for GraphQL auto-configuration
...
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.
Closes gh-31809
2022-08-01 14:33:25 +02:00
Andy Wilkinson
5c057a2730
Auto-configure the new Elasticsearch clients
...
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.
As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.
Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Andy Wilkinson
7f00378eaf
Polish "Start building against Spring Data 2022.0.0-M5 snapshots"
...
See gh-31582
2022-07-07 16:32:13 +01:00
Andy Wilkinson
631b1e0d76
Merge branch '2.7.x'
...
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2022-06-24 12:57:52 +01: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
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
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
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
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
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
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
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
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
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
2e32f800e1
Merge branch '2.7.x'
2022-03-25 13:34:37 +00:00
Andy Wilkinson
8646ac4215
Move JsonComponent docs to general Jackson section
...
Closes gh-30405
2022-03-25 13:30:06 +00:00
Andy Wilkinson
5d09260870
Reinstate support for REST Assured
...
Closes gh-29543
Closes gh-30426
2022-03-25 10:12:42 +00:00
Stephane Nicoll
b8e93b27af
Merge branch '2.7.x'
2022-03-21 14:15:29 +01:00
Stephane Nicoll
7402a584bd
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30347
2022-03-21 14:15:13 +01:00
Stephane Nicoll
55a385cc36
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30346
2022-03-21 14:00:30 +01:00
Henning Poettker
9d46a18406
Document WebSecurityCustomizer for H2 Console
...
See gh-29932
2022-03-21 13:38:42 +01:00
Stephane Nicoll
2088381d4b
Merge branch '2.7.x'
2022-03-21 10:06:56 +01:00
Stephane Nicoll
a2959bbcf2
Polish "Add support for cache2k in memory caching"
...
See gh-28498
2022-03-21 09:59:24 +01:00
Andy Wilkinson
17b5611ace
Merge branch '2.7.x'
2022-03-19 11:05:21 +00:00
Andy Wilkinson
f05c19a40a
Kotlin Fix JsonSerializer example in reference guide
...
Closes gh-30331
2022-03-19 10:53:22 +00:00
Stephane Nicoll
c322cebe49
Merge branch '2.7.x'
2022-03-19 09:28:43 +01:00
Stephane Nicoll
d8bb2ec4e0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30331
2022-03-19 09:28:35 +01:00
Stephane Nicoll
bce247eafb
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30330
2022-03-19 09:28:24 +01:00
Stephane Nicoll
39339ccb49
Update copyright year of change file
...
See gh-30329
2022-03-19 09:25:46 +01:00
SangHyun-Park
8536100009
Fix JsonSerializer example in reference guide
...
See gh-30329
2022-03-19 09:25:12 +01:00
Andy Wilkinson
568cd687af
Remove support for REST Assured until it supports Groovy 4.0
...
REST Assured does not work with Groovy 4.0 so support is being
temporarily removed again.
See gh-29543
2022-03-18 12:35:19 +00:00
Madhura Bhave
70efe7d384
Fix javax import
2022-03-08 19:02:20 -08:00
Madhura Bhave
f10f27c3d4
Merge branch '2.7.x' into main
2022-03-08 17:41:28 -08:00
Madhura Bhave
ba7ba08811
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30110
2022-03-08 17:41:12 -08:00
Madhura Bhave
9c437c6cd9
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30109
2022-03-08 17:40:52 -08:00
Madhura Bhave
d240e293db
Document how to obtain ServletContext with an embedded container setup
...
Closes gh-24561
2022-03-08 17:34:35 -08:00
Brian Clozel
81754c8bc4
Upgrade to Spring GraphQL 1.0.0-SNAPSHOT
...
This commit switches to 1.0.0-SNAPSHOT for Spring GraphQL, before its
upcoming 1.0.0-M6 version.
This commit adapts to the changes introduced in
spring-projects/spring-graphql#317 : now that `GraphQlClient` has been
introduced, `GraphQlTester` has been aligned with the new
infrastructure. The `@GraphQlTest` and `@SpringBootTest` testing support
is now using different variants for each.
All samples have been updated to use the proper GraphQL terminology, see
and spring-projects/spring-graphql#310 .
See gh-29637
2022-03-08 17:54:54 +01:00
Stephane Nicoll
37ccc52b8a
Merge branch '2.7.x'
2022-03-08 12:34:30 +01:00
Stephane Nicoll
d67aa3c054
Fix null safety in Kotlin examples
...
Closes gh-30097
2022-03-08 12:34:02 +01:00
Madhura Bhave
0e71d80590
Merge branch '2.7.x' into main
2022-03-07 20:23:07 -08:00
Madhura Bhave
88bd0fa794
Merge branch '2.6.x' into 2.7.x
2022-03-07 20:22:57 -08:00
Madhura Bhave
27bf068091
Merge branch '2.5.x' into 2.6.x
2022-03-07 20:22:42 -08:00
Madhura Bhave
9b073c825b
Fix checkstyle
2022-03-07 20:22:27 -08:00
Madhura Bhave
524c0e1474
Merge branch '2.7.x' into main
2022-03-07 18:23:50 -08:00
Madhura Bhave
b80047c451
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30092
2022-03-07 18:23:36 -08:00
Madhura Bhave
ac04be75f8
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30091
2022-03-07 18:23:19 -08:00
Madhura Bhave
ed8f8d59ef
Document how to structure configurations for efficient slice tests
...
Closes gh-16088
2022-03-07 18:21:12 -08:00
Moritz Halbritter
1793cee00f
Start building against Micrometer 2.0.0-M3
...
See gh-29753
2022-03-04 11:03:22 +01:00
Andy Wilkinson
c10a6b7b3e
Merge branch '2.7.x'
2022-03-03 11:36:49 +00:00
Andy Wilkinson
1910a3b33e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30049
2022-03-03 11:31:51 +00:00
Andy Wilkinson
d11c5d3bd2
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30048
2022-03-03 11:27:18 +00:00
wonwoo
c2bf0d551b
Polish RestController examples
...
See gh-30027
2022-03-03 11:26:11 +00:00
Moritz Halbritter
7897a913a7
Start building against Micrometer 1.9.0-M4 snapshots
...
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.
See gh-30014
2022-03-01 09:20:07 +01:00
Andy Wilkinson
7dc40e95d2
Merge branch '2.7.x'
2022-02-24 12:06:21 +00:00
Eddú Meléndez
36e52758a7
Add DataCouchbaseTest annotation
...
See gh-29912
2022-02-24 11:45:09 +00:00
Andy Wilkinson
4093fff225
Merge branch '2.7.x'
2022-02-24 11:24:23 +00:00
Andy Wilkinson
53292a1f94
Polish "Add DataElasticsearchTest annotation"
...
See gh-29911
2022-02-24 11:21:24 +00:00
Eddú Meléndez
e22f78bc6a
Add DataElasticsearchTest annotation
...
See gh-29911
2022-02-24 10:27:20 +00:00
Phillip Webb
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
Phillip Webb
f4b849ec95
Merge branch '2.7.x'
2022-02-16 20:27:18 -08:00
Phillip Webb
26512f8ac6
Merge branch '2.6.x' into 2.7.x
2022-02-16 20:24:59 -08:00
Phillip Webb
5b4ec32645
Merge branch '2.5.x' into 2.6.x
2022-02-16 18:56:12 -08:00
Phillip Webb
c86b1330cf
Update copyright year of changed files
2022-02-16 17:56:19 -08:00
Madhura Bhave
bf1ed5f2f8
Update copyright header on changed files
2022-02-16 14:24:22 -08:00
Madhura Bhave
e20ee87b5d
Remove explicit @ConstructorBinding on type
...
See gh-23216
2022-02-16 14:23:33 -08:00
Madhura Bhave
44b88cc88c
Allow @ConstructorBinding to be optional
...
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.
Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.
Closes gh-23216
2022-02-16 13:47:26 -08:00
Moritz Halbritter
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01:00
Moritz Halbritter
44beceffaf
Merge branch '2.7.x'
2022-02-10 13:39:22 +01:00
Moritz Halbritter
96ce8d842e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29729
2022-02-10 13:38:50 +01:00
Moritz Halbritter
44ff29c4d4
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29728
2022-02-10 13:28:15 +01:00
Moritz Halbritter
096ba72a39
Add documentation for WebMvc.fn
...
See gh-29683
2022-02-10 13:14:34 +01:00
Andy Wilkinson
819f40f81e
Merge branch '2.7.x'
2022-02-09 13:39:28 +00:00
Andy Wilkinson
e4b074f07b
Merge branch '2.6.x' into 2.7.x
2022-02-09 13:37:50 +00:00
Phillip Webb
ce6b12a024
Merge branch '2.7.x'
2022-02-05 10:16:48 -08:00
Phillip Webb
26dd6b826c
Merge branch '2.6.x' into 2.7.x
2022-02-05 10:16:19 -08:00
Phillip Webb
b3a82c9de6
Merge branch '2.5.x' into 2.6.x
2022-02-05 10:16:03 -08:00
Phillip Webb
52f1799c20
Polish formatting
2022-02-05 10:15:43 -08:00