Merge branch '2.1.x'

This commit is contained in:
Jeremy Mikola 2013-05-15 10:58:47 -05:00
commit 814460dbf2
5 changed files with 44 additions and 5 deletions

View file

@ -177,6 +177,7 @@ class Configuration implements ConfigurationInterface
->addDefaultsIfNotSet()
->children()
->scalarNode('hydrate')->defaultTrue()->end()
->scalarNode('ignore_missing')->defaultFalse()->end()
->scalarNode('service')->end()
->end()
->end()
@ -267,6 +268,7 @@ class Configuration implements ConfigurationInterface
->addDefaultsIfNotSet()
->children()
->scalarNode('hydrate')->defaultTrue()->end()
->scalarNode('ignore_missing')->defaultFalse()->end()
->scalarNode('service')->end()
->end()
->end()