Merge remote-tracking branch 'upstream/pr/684' into 3.0.x

2014-08-08 08:33:59 +10:00 · 2014-08-08 08:33:59 +10:00 · 84cf6c79c2
parent dafe8abe0e f5987a48b9
commit 84cf6c79c2
1 changed files with 1 additions and 0 deletions
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@ -73,6 +73,7 @@ class Configuration implements ConfigurationInterface
                ->arrayNode('clients')
                    ->useAttributeAsKey('id')
                    ->prototype('array')
+                        ->performNoDeepMerging()
                        // BC - Renaming 'servers' node to 'connections'
                        ->beforeNormalization()
                        ->ifTrue(function($v) { return isset($v['servers']); })