Phillip Webb 1e4d974ec0 Merge remote-tracking branch 'local12x/1.2.x'

2015-10-19 12:56:55 -07:00

..

main/java/sample/data/redis

…

test/java/sample/data/redis

Organize imports with new settings

2015-10-19 12:55:44 -07:00