spring-boot/spring-boot-docs
Phillip Webb 872f30e5d0 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
2014-10-06 10:29:04 -07:00
..
src/main Merge branch '1.1.x' 2014-10-06 10:29:04 -07:00
pom.xml Merge branch '1.1.x' 2014-10-01 14:29:19 +01:00