Merge branch '1.4.x' into 1.5.x

2016-10-30 10:59:02 +01:00
parent f6959ccbcd 88d95260d3
commit c4d8fb1c09
6 changed files with 36 additions and 10 deletions
--- a/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -47,6 +47,12 @@
      "vcap_services"
    ]
  },
+  {
+    "name": "endpoints.hypermedia.enabled",
+    "type": "java.lang.Boolean",
+    "description": "Enable hypermedia support for endpoints.",
+    "defaultValue": false
+  },
  {
    "name": "endpoints.info.path",
    "type": "java.lang.String",