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

Merge branch 'transport-option' of https://github.com/milan/FOSElasticaBundle into transport-option

Browse source 
Conflicts:
	DependencyInjection/Configuration.php
This commit is contained in:
Tim Nagel 2014-06-08 18:00:17 +10:00
commit 833feee207
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

@ -84,6 +84,7 @@ class Configuration implements ConfigurationInterface
'logger' => isset($v['logger']) ? $v['logger'] : null,
'headers' => isset($v['headers']) ? $v['headers'] : null,
'timeout' => isset($v['timeout']) ? $v['timeout'] : null,
'transport' => isset($v['transport']) ? $v['transport'] : null,
)
)
);
@ -112,6 +113,7 @@ class Configuration implements ConfigurationInterface
->useAttributeAsKey('name')
->prototype('scalar')->end()
->end()
->scalarNode('transport')->end()
->scalarNode('timeout')->end()
->end()
->end()