twitbuntu

Merge lp:~lukasz-czyzykowski/twitbuntu/settings-cleanup into lp:twitbuntu

  1. settings-cleanup
  2. Merge into trunk
Proposed by Łukasz Czyżykowski
Status: Merged
Approved by: Łukasz Czyżykowski
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~lukasz-czyzykowski/twitbuntu/settings-cleanup
Merge into: lp:twitbuntu
Diff against target: 27 lines (+6/-7)
1 file modified
settings.py (+6/-7)
To merge this branch: bzr merge lp:~lukasz-czyzykowski/twitbuntu/settings-cleanup
Reviewer Review Type Date Requested Status
Łukasz Czyżykowski Approve
Review via email: mp+34975@code.launchpad.net

Commit message

Cleaning up settings.py

To post a comment you must log in.
Revision history for this message
Łukasz Czyżykowski (lukasz-czyzykowski) wrote :

OK.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'settings.py'
2--- settings.py 2010-09-08 19:05:39 +0000
3+++ settings.py 2010-09-09 14:01:01 +0000
4@@ -4,17 +4,16 @@
5 TEMPLATE_DEBUG = DEBUG
6
7 ADMINS = (
8- # ('Your Name', 'your_email@domain.com'),
9 )
10
11 MANAGERS = ADMINS
12
13-DATABASE_ENGINE = 'sqlite3' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
14-DATABASE_NAME = 'db.sqlite' # Or path to database file if using sqlite3.
15-DATABASE_USER = '' # Not used with sqlite3.
16-DATABASE_PASSWORD = '' # Not used with sqlite3.
17-DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3.
18-DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3.
19+DATABASE_ENGINE = 'sqlite3'
20+DATABASE_NAME = 'db.sqlite'
21+DATABASE_USER = ''
22+DATABASE_PASSWORD = ''
23+DATABASE_HOST = ''
24+DATABASE_PORT = ''
25
26 # Local time zone for this installation. Choices can be found here:
27 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name

Subscribers

People subscribed via source and target branches

to all changes: