← Back to branch summary

~lutostag/ubuntu/utopic/maas/1.5.2

~lutostag/ubuntu/utopic/maas/1.5.2

« back to all changes in this revision

Viewing changes to debian/patches/01-fix-database-settings.patch

Committer: Package Import Robot
Author(s): Andres Rodriguez, Dustin Kirkland, Andres Rodriguez
Date: 2014-01-31 09:38:51 UTC
mfrom: (1.2.21)
Revision ID: package-import@ubuntu.com-20140131093851-0jd8i9q57uxqxk3i

Tags: 1.5+bzr1909-0ubuntu1

https://launchpad.net/bugs/1274448

* New upstream release.

[ Dustin Kirkland ]
* debian/maas-region-controller-min.postinst: Fix typo in sed. Remove
  double quotes. (LP: #1274448)

[ Andres Rodriguez ]
* debian/control: Add depends on python-crochet.
* Get rid of dfsg on the versioning as we no longer strip any code from
  the orig tarball.
  - debian/rules: Do not strip any files out of the tarball.
* debian/patches/*: Refreshed.

files added:
etc/services

scripts/ampclient.py

src/maasserver/admin.py

src/maasserver/eventloop.py

src/maasserver/migrations/0066_rename_vlan_add_link_node_network.py

src/maasserver/models/network.py

src/maasserver/models/tests/test_network.py

src/maasserver/rpc

src/maasserver/rpc/__init__.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests

src/maasserver/rpc/tests/__init__.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/templates/maasserver/network_add.html

src/maasserver/templates/maasserver/network_confirm_delete.html

src/maasserver/templates/maasserver/network_detail.html

src/maasserver/templates/maasserver/network_edit.html

src/maasserver/templates/maasserver/network_list.html

src/maasserver/tests/test_views_networks.py

src/maasserver/utils/network.py

src/maasserver/utils/tests/test_network.py

src/maasserver/views/networks.py

src/metadataserver/admin.py

src/provisioningserver/rpc

src/provisioningserver/rpc/__init__.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/testing.py

src/provisioningserver/rpc/tests

src/provisioningserver/rpc/tests/__init__.py

src/provisioningserver/rpc/tests/test_clusterservice.py

files removed:
src/maasserver/models/tests/test_vlan.py

src/maasserver/models/vlan.py

files modified:
.pc/01-fix-database-settings.patch/contrib/maas_local_settings.py

.pc/02-pserv-config.patch/etc/maas/pserv.yaml

HACKING.txt

buildout.cfg

contrib/maas_local_settings.py

contrib/preseeds_v2/curtin_userdata

debian/changelog

debian/control

debian/maas-region-controller-min.postinst

debian/patches/01-fix-database-settings.patch

debian/patches/02-pserv-config.patch

debian/patches/03-txlongpoll-config.patch

debian/rules

docs/cluster-configuration.rst

docs/configure.rst

docs/man/maas.8.rst

etc/maas/pserv.yaml

etc/maas/templates/dhcp/dhcpd.conf.template

src/maas/demo.py

src/maas/settings.py

src/maas/urls.py

src/maasserver/api.py

src/maasserver/api_utils.py

src/maasserver/dhcp.py

src/maasserver/dhcp_connect.py

src/maasserver/dns.py

src/maasserver/dns_connect.py

src/maasserver/forms.py

src/maasserver/models/__init__.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/signals.py

src/maasserver/start_up.py

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/snippets.html

src/maasserver/templates/registration/login.html

src/maasserver/testing/api.py

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_commissioning.py

src/maasserver/tests/test_api_describe.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_filestorage.py

src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_api_register.py

src/maasserver/tests/test_api_utils.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_dns.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_signals.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_views.py

src/maasserver/tests/test_views_nodes.py

src/maasserver/tests/test_views_prefs.py

src/maasserver/tests/test_views_settings.py

src/maasserver/tests/test_views_settings_clusters.py

src/maasserver/tests/test_views_settings_commissioning_scripts.py

src/maasserver/tests/test_views_tags.py

src/maasserver/tests/test_views_zones.py

src/maasserver/urls.py

src/maastesting/djangotestcase.py

src/maastesting/factory.py

src/maastesting/matchers.py

src/maastesting/testcase.py

src/maastesting/tests/test_factory.py

src/metadataserver/models/__init__.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_commissioningscript.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/detect.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/dhcp/tests/test_writer.py

src/provisioningserver/dhcp/writer.py

src/provisioningserver/enum.py

src/provisioningserver/import_images/ephemerals_script.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/plugin.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_tasks.py

templates/model.py

versions.cfg

Show diffs side-by-side

added added

removed removed

debian/patches/01-fix-database-settings.patch

1

Index: maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py

2

===================================================================

3

--- maas-0.1+bzr702+dfsg.orig.orig/contrib/maas_local_settings.py 2012-06-29 12:03:20.000000000 -0400

4

+++ maas-0.1+bzr702+dfsg.orig/contrib/maas_local_settings.py 2012-06-29 12:17:00.733389757 -0400

1

--- maas-1.5+bzr1908.orig.orig/contrib/maas_local_settings.py 2014-02-07 11:22:59.330556956 -0500

2

+++ maas-1.5+bzr1908.orig/contrib/maas_local_settings.py 2014-02-07 11:22:59.326556956 -0500

5

3

@@ -7,7 +7,7 @@

6

4

DEFAULT_MAAS_URL = "http://maas.internal.example.com/"

7

5

11

9

12

10

# Prefix to use for MAAS's urls.

13

11

# If FORCE_SCRIPT_NAME is None (the default), all the urls will start with

14

@@ -68,9 +68,9 @@

12

@@ -81,9 +81,9 @@

15

13

'default': {

16

14

# 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.

17

15

'ENGINE': 'django.db.backends.postgresql_psycopg2',

Older »