Merge branch '2.0'

This commit is contained in:
Jeremy Mikola 2012-10-03 10:49:05 -04:00
commit 7bee84e2fa

View file

@ -46,8 +46,9 @@ class Configuration
->prototype('array')
->performNoDeepMerging()
->children()
->scalarNode('host')->defaultValue('localhost')->end()
->scalarNode('port')->defaultValue('9000')->end()
->scalarNode('url')->end()
->scalarNode('host')->end()
->scalarNode('port')->end()
->scalarNode('timeout')->end()
->scalarNode('headers')->end()
->end()