Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x

2018-05-25 18:45:37 -07:00

..

HelloWorldService.java

Update copyright year for changed files

2016-12-30 11:53:51 -08:00

SampleEndpoint.java

Remove unnecessary use of @Autowired in the samples

2017-01-24 10:52:50 +00:00

SampleParentContextApplication.java

Merge branch '1.5.x' into 2.0.x

2018-05-25 18:45:37 -07:00

ServiceProperties.java

Support for Jmx (and Integration) autoconfig in parent contexts

2014-06-10 15:12:30 +01:00