Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Richard Miller 2013-12-04 08:02:22 +00:00
commit 2980ee818a

View file

@ -347,6 +347,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('term_vector')->end()
->scalarNode('null_value')->end()
->booleanNode('include_in_all')->defaultValue(true)->end()
->booleanNode('enabled')->defaultValue(true)->end()
->scalarNode('lat_lon')->end()
->scalarNode('index_name')->end()
->booleanNode('omit_norms')->end()