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

Merge remote-tracking branch 'PeerJ/AddServerTimeout'

Browse source 
Conflicts:
	DependencyInjection/Configuration.php
This commit is contained in:
Tim Nagel 2014-02-19 13:39:03 +11:00
parent 5a36d8f769 3065c96a2c
commit aa9d74a8a0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
DependencyInjection/Configuration.php
View file

@ -109,6 +109,7 @@ class Configuration implements ConfigurationInterface
->treatNullLike('fos_elastica.logger')
->treatTrueLike('fos_elastica.logger')
->end()
->scalarNode('timeout')->end()
->end()
->end()
->end()
@ -670,7 +671,7 @@ class Configuration implements ConfigurationInterface
return $node;
}
/**
* Returns the array node used for "_ttl"
*/
@ -689,5 +690,5 @@ class Configuration implements ConfigurationInterface
;
return $node;
}
}
}