root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

This commit is contained in:
Andy Wilkinson 2015-04-07 11:40:41 +01:00
parent 3df6cb1325 d4ffab2f02
commit a69cd36dbc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@ -64,6 +64,11 @@
"type": "java.lang.String", "type": "java.lang.String",
"description": "Preferred JSON mapper to use for HTTP message conversion." "description": "Preferred JSON mapper to use for HTTP message conversion."
}, },
{
"name": "spring.http.gzip.enabled",
"type": "java.lang.Boolean",
"description": "Enable gzip filter support."
},
{ {
"name": "spring.jmx.enabled", "name": "spring.jmx.enabled",
"type": "java.lang.Boolean", "type": "java.lang.Boolean",