-
Committer:
Andres Rodriguez
-
Date:
2013-03-04 16:51:28 UTC
-
mfrom:
(161.2.2 raring)
-
mto:
This revision was merged to the branch mainline in
revision
165.
-
Revision ID:
andreserl@ubuntu.com-20130304165128-1xkle3tw3bhcjt18
- maas-cluster-controller Conflicts/Replaces maas-region-controller as
import scripts are no longer shipped in the region.
- debian/control: Depends on distro-info for maas-cluster-controller
instead of maas-region-controller (LP: #1103194)
* debian/maas-cluster-controller.config: If URL has been detected,
add /MAAS if it doesn't contain it. This helps upgrades from versions
where DEFAULT_MAAS_URL didn't use /MAAS.