summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Pellerin <jpellerin@gmail.com>2006-06-30 18:00:58 +0000
committerJason Pellerin <jpellerin@gmail.com>2006-06-30 18:00:58 +0000
commit3d8ebb3bec77948d3b7ca1a58160d897ed8dbc46 (patch)
tree548f20706a7158bd04f3ce4033a59f29c93b5797
parenta50d895f289cee37b5ae53f1bee33fbdea5a0fa3 (diff)
[multi-db] Added DATABASES = {} to global_settings
git-svn-id: http://code.djangoproject.com/svn/django/branches/multiple-db-support@3239 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/global_settings.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index a1dff3c815..70c37d4de2 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -91,6 +91,9 @@ DATABASE_PASSWORD = '' # Not used with sqlite3.
DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
+# Optional named database connections in addition to the default.
+DATABASES = {}
+
# Host for sending e-mail.
EMAIL_HOST = 'localhost'