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

[Julian Edwards]

Fix packaging broken by a recent upstream commit.

[Julian Edwards (julian-edwards)]

This is just quilt refresh.

[Julian Edwards (julian-edwards)]

Tested working so selfie.

review: Approve

=== modified file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2014-10-10 12:27:35 +0000
+++ debian/patches/01-fix-database-settings.patch	2014-11-21 20:33:22 +0000
@@ -9,7 +9,7 @@
  
  # Prefix to use for MAAS's urls.
  # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
-@@ -81,9 +81,9 @@
+@@ -78,9 +78,9 @@
      'default': {
          # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
          'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -20,5 +20,5 @@
 +        'USER': 'maas',
 +        'PASSWORD': 'maas',
          'HOST': 'localhost',
-         'OPTIONS': {
-             'isolation_level': ISOLATION_LEVEL_READ_COMMITTED,
+     }
+ }