MAAS

Merge lp:~julian-edwards/maas/fix-patches into lp:~maas-maintainers/maas/packaging

  1. fix-patches
  2. Merge into packaging
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 333
Merged at revision: 333
Proposed branch: lp:~julian-edwards/maas/fix-patches
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 20 lines (+3/-3)
1 file modified
debian/patches/01-fix-database-settings.patch (+3/-3)
To merge this branch: bzr merge lp:~julian-edwards/maas/fix-patches
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+242537@code.launchpad.net

Commit message

Fix packaging broken by a recent upstream commit.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

This is just quilt refresh.

Revision history for this message
Julian Edwards (julian-edwards) wrote :

Tested working so selfie.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/01-fix-database-settings.patch'
2--- debian/patches/01-fix-database-settings.patch 2014-10-10 12:27:35 +0000
3+++ debian/patches/01-fix-database-settings.patch 2014-11-21 20:33:22 +0000
4@@ -9,7 +9,7 @@
5
6 # Prefix to use for MAAS's urls.
7 # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
8-@@ -81,9 +81,9 @@
9+@@ -78,9 +78,9 @@
10 'default': {
11 # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
12 'ENGINE': 'django.db.backends.postgresql_psycopg2',
13@@ -20,5 +20,5 @@
14 + 'USER': 'maas',
15 + 'PASSWORD': 'maas',
16 'HOST': 'localhost',
17- 'OPTIONS': {
18- 'isolation_level': ISOLATION_LEVEL_READ_COMMITTED,
19+ }
20+ }

Subscribers

People subscribed via source and target branches