2 Commits

Author	SHA1	Message	Date
Andy Wilkinson	9fbd38ab3c	Merge branch '1.5.x' into 2.0.x	2019-03-20 16:45:26 +00:00
Brian Clozel	fed8c8a681	Adapt WebFlux.fn auto-config to SPR-15536 ... Since SPR-15536, WebFlux.fn is now configured with `@EnableWebFlux`, along the annotated controllers. Both `RouterFunction` and Controller instances can now live within the same application and they share the same web infrastructure. This commit removes the custom auto-configuration for `RouterFunction` and relies on `@EnableWebFlux` for that. Closes gh-9165	2017-05-24 14:54:05 +02:00