Merge branch '2.0.x'

6 years ago · cde3c21926
parent 598b1f4300 5fd30a9dc2
commit cde3c21926
1 changed files with 1 additions and 1 deletions
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/tomcat/TomcatServletWebServerFactoryTests.java
@ -378,7 +378,7 @@ public class TomcatServletWebServerFactoryTests
 	}

 	@Test
-	public void defaultLocaleCharsetMappingsAreOverriden() {
+	public void defaultLocaleCharsetMappingsAreOverridden() {
 		TomcatServletWebServerFactory factory = getFactory();
 		this.webServer = factory.getWebServer();
 		// override defaults, see org.apache.catalina.util.CharsetMapperDefault.properties