deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'Fran6co/imp-lat_lon'

Browse source 
Conflicts:
	DependencyInjection/Configuration.php
This commit is contained in:
Richard Miller 2012-08-02 14:54:49 +01:00
commit 123da22ebd
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DependencyInjection/Configuration.php
View file

@ -244,6 +244,7 @@ class Configuration
->scalarNode('term_vector')->end()
->scalarNode('null_value')->end()
->booleanNode('include_in_all')->defaultValue('true')->end()
->scalarNode('lat_lon')->end()
->arrayNode('fields')
->useAttributeAsKey('name')
->prototype('array')
@ -260,6 +261,7 @@ class Configuration
->scalarNode('term_vector')->end()
->scalarNode('null_value')->end()
->booleanNode('include_in_all')->defaultValue('true')->end()
->scalarNode('lat_lon')->end()
->end()
->end()
->end()