Merge lp:~rvb/maas/packaging.moon into lp:~maas-maintainers/maas/packaging

[Raphaël Badin]

Update the patch to contrib/maas_local_settings.py to cope with the changes https://code.launchpad.net/~allenap/maas/transactions-redux-the-revenge/+merge/238864 made to contrib/maas_local_settings.py.

See https://code.launchpad.net/~allenap/maas/transactions-redux-the-revenge/+merge/238864 for details.

[Julian Edwards (julian-edwards)]

Did you do a test build? Quilt gets a bit funny about patches sometimes.

review: Approve

[MAAS Lander (maas-lander)]

Attempt to merge into lp:~maas-maintainers/maas/packaging failed due to conflicts:

text conflict in debian/patches/01-fix-database-settings.patch

[Gavin Panella (allenap)]

This has been superseded by Julian's faster-than-light quilt refresh.

[Julian Edwards (julian-edwards)]

On Friday 21 Nov 2014 21:23:42 you wrote:
> This has been superseded by Julian's faster-than-light quilt refresh.

I was teaching gmb and newell how to refresh packaging patches and it would
have been rude to not land the change :)

=== 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-03 10:39:24 +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,6 @@
 +        'USER': 'maas',
 +        'PASSWORD': 'maas',
          'HOST': 'localhost',
-         'OPTIONS': {
-             'isolation_level': ISOLATION_LEVEL_READ_COMMITTED,
+     }
+ }
+