Merge branch '3.0.x'

2015-01-22 11:26:07 +11:00 · 2015-01-22 11:26:07 +11:00 · 7f28be3c4e
commit 7f28be3c4e
parent 1cea135dc5 79e263d7a7
6 changed files with 50 additions and 23 deletions
--- a/Tests/Functional/app/Basic/config.yml
+++ b/Tests/Functional/app/Basic/config.yml
@ -95,3 +95,4 @@ fos_elastica:
                        identifier: "id"
                null_mappings:
                    mappings: ~
+        empty_index: ~