← Back to branch summary

~jtv/maas/1.2-bug-1069734

~jtv/maas/1.2-bug-1069734

Viewing all changes in revision 1268.

Committer: Julian Edwards
Date: 2012-10-17 05:21:12 UTC
Revision ID: julian.edwards@canonical.com-20121017052112-o5y36c1ufxqmu85q

merge r1278 from trunk

files modified:
etc/celeryconfig_common.py

etc/democeleryconfig_common.py

src/provisioningserver/dns/config.py

src/provisioningserver/dns/tests/test_config.py

Show diffs side-by-side

added added

removed removed

etc/celeryconfig_common.py

etc/democeleryconfig_common.py

src/provisioningserver/dns/config.py

src/provisioningserver/dns/tests/test_config.py

Older »