2656 Commits (ba2c38c803fee89f00bc1c50967243f4da751e04)
 

Author SHA1 Message Date
Andy Wilkinson ba2c38c803 Merge branch '1.1.x' 12 years ago
Andy Wilkinson 32a19f590d Enable test that relies on class and groovy script configuration 12 years ago
Andy Wilkinson 29b388e6a9 Merge branch '1.1.x' 12 years ago
Andy Wilkinson cba50b8ee7 Upgrade to Groovy 2.3.5 12 years ago
Andy Wilkinson 8583317651 Merge branch '1.1.x' 12 years ago
Andy Wilkinson bd577f1515 Rework Jetty startup so connectors are only started once 12 years ago
Dave Syer 13c94172b0 Merge branch '1.1.x' 12 years ago
Dave Syer 8c15b13fda Change private method name 12 years ago
Dave Syer cc51296397 Merge branch '1.1.x' 12 years ago
Dave Syer 32ede50d19 Extract property sources from composite when binding 12 years ago
Andy Wilkinson f97251b9cf Merge branch '1.1.x' 12 years ago
Andy Wilkinson f5c8a8879a Isolate CLI integration tests from any settings decryption failures 12 years ago
Andy Wilkinson 3c99bbf524 Merge branch '1.1.x' 12 years ago
Andy Wilkinson 7bb1f7eb77 Polishing: use passed-in ssl instance rather than calling getSsl() 12 years ago
Andy Wilkinson 4d4cc076c6 Don't fail hard when settings.xml can't be decrypted by the CLI 12 years ago
Andy Wilkinson 0960908bd7 Add support for configuring SSL declaratively 12 years ago
Christian Dupuis d26ecbef04 Merge branch '1.1.x' 12 years ago
Christian Dupuis 68163a66a5 Change query in MongoHealthIndicator 12 years ago
Christian Dupuis 13ee41d04d Change query in MongoHealthIndicator 12 years ago
Andy Wilkinson d04f325294 Merge branch '1.1.x' 12 years ago
Andy Wilkinson 7945b29669 Correct the descriptions of two sample projects 12 years ago
Andy Wilkinson cef1ec43a6 Merge branch '1.1.x' 12 years ago
Andy Wilkinson 664319009c Correct the profile name in Travis configuration 12 years ago
Dave Syer d5395bfa83 Merge branch '1.1.x' 12 years ago
Dave Syer ac2ab39a54 Use class name not value to support non-Hibernate JPA vendors 12 years ago
Christian Dupuis 99b3240ab2 Ensure custom HTTP code mappings for /health don't remove default mappings 12 years ago
ddebree 5e02ee6974 Add java options for Heroku Procfile 12 years ago
Stephane Nicoll 16c2477da2 Documentation update 12 years ago
Christian Dupuis 977c5a988c Ensure custom HTTP code mappings for /health don't remove default mappings 12 years ago
Dave Syer 300e570f68 Reverse priority of property sources when extracting sub properties 12 years ago
Dave Syer a9b8563bb6 Fix typo (fixes gh-1273) 12 years ago
Andy Wilkinson 2ca5e8e5d6 Merge branch '1.1.x' 12 years ago
Andy Wilkinson 0a70bd44ed Correct the default Logback config location in the documentation 12 years ago
Christian Dupuis 2f28a1017c Polish and re-add author name 12 years ago
Stephane Nicoll 2be6b3e419 Flexible registration of additional PublicMetrics 12 years ago
Christian Dupuis 99971a6578 Fix HTTP status code mapping in HealthMvcEndpoint 12 years ago
Andy Wilkinson 3145edff3a Upgrade to Spring 4.1.0 and use Yaml support that migrated from Boot 12 years ago
Dave Syer 890fc71967 Merge branch '1.1.x' 12 years ago
Dave Syer 4a33ab5577 Make sure ErrorPageFilter is only applied once per request 12 years ago
Dave Syer 8cb90a5645 Merge branch '1.1.x' 12 years ago
Dave Syer 0c52817c88 Ensure order is preserved in Rabbit addresses 12 years ago
Stephane Nicoll 120ad56a5c Replace @ConditionalOnExpression 12 years ago
Stephane Nicoll 270809783c Merge @ConditionalOnPropertyValue 12 years ago
Dave Syer fc9b160a72 Merge branch '1.1.x' 12 years ago
Dave Syer 8853c7c352 Ensure properties that are not enumerable can be resolved from placeholders 12 years ago
Stephane Nicoll d7d77f3d06 Add OnPropertyValueCondition annotation 12 years ago
Andy Wilkinson db2b20879d Merge branch '1.1.x' 12 years ago
Andy Wilkinson 672d713f99 Add dependency management for spock-spring and document its use 12 years ago
Andy Wilkinson 41ca0f604a Merge branch '1.1.x' 12 years ago
Andy Wilkinson 847627810a Merge branch '1.1.x' 12 years ago