Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2017-02-08 14:29:48 +01:00
parent ca3bc3f47a 8a59e88a9d
commit cea64f6a32
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfiguration.java
View File

@@ -69,6 +69,7 @@ import org.springframework.util.StringUtils;
* @author Josh Long
* @author Phillip Webb
* @author Eddú Meléndez
* @author Stephane Nicoll
* @since 1.1.0
*/
@Configuration
@@ -140,7 +141,7 @@ public class MongoDataAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public CustomConversions customConversions() {
public CustomConversions mongoCustomConversions() {
return new CustomConversions(Collections.emptyList());
}