Merge branch '1.1.x'

This commit is contained in:
Phillip Webb
2014-09-25 22:04:23 -07:00

View File

@@ -66,7 +66,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
protected static class JacksonConfig {
@Bean
public MappingJackson2HttpMessageConverter jacksonMessaegConverter() {
public MappingJackson2HttpMessageConverter jacksonMessageConverter() {
MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
converter.setObjectMapper(objectMapper());
return converter;