Merge branch '1.5.x'

2016-11-30 10:56:14 +01:00
parent 0568afc6cb 619addcbde
commit 2dbebf67e8
3 changed files with 6 additions and 23 deletions
--- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -368,25 +368,6 @@
      }
    ]
  },
-  {
-    "name": "spring.data.neo4j.session.scope",
-    "values": [
-      {
-        "value": "singleton"
-      },
-      {
-        "value": "session"
-      },
-      {
-        "value": "request"
-      }
-    ],
-    "providers": [
-      {
-        "name": "any"
-      }
-    ]
-  },
  {
    "name": "spring.datasource.driver-class-name",
    "providers": [