Phillip Webb 1e4d974ec0 Merge remote-tracking branch 'local12x/1.2.x'		2015-10-19 12:56:55 -07:00
..
main	Update samples to use specific log configuration	2014-12-17 11:33:29 -08:00
test/java/sample/actuator/log4j	Merge remote-tracking branch 'local12x/1.2.x'	2015-10-19 12:56:55 -07:00