diff options
| author | Tim Graham <timograham@gmail.com> | 2014-06-12 09:28:36 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-12 09:28:36 -0400 |
| commit | a2cd0e12c9410a7b8a30064e3967c617f4de2de5 (patch) | |
| tree | 5078ef51ab6619a5f621acbd4cde1b0b19946249 /django/db/utils.py | |
| parent | 1c58cabad7f5b792e9cfd8f00feffd8212fdfbb1 (diff) | |
Silenced deprecation warnings for refs #22811 and fixed build.
Diffstat (limited to 'django/db/utils.py')
| -rw-r--r-- | django/db/utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/utils.py b/django/db/utils.py index 01b46a1af0..4fb75e3150 100644 --- a/django/db/utils.py +++ b/django/db/utils.py @@ -210,7 +210,7 @@ class ConnectionHandler(object): "Connection '%s' has mismatched TEST and TEST_* " "database settings." % alias) else: - test_settings = old_test_settings + test_settings.update(old_test_settings) for key, _ in six.iteritems(old_test_settings): warnings.warn("In Django 1.9 the %s connection setting will be moved " "to a %s entry in the TEST setting" % |