Viewing all changes in revision 2214.
- Committer: Gavin Panella
- Date: 2014-04-01 15:17:50 UTC
- mfrom: (1745.2.440 maas)
- Revision ID: gavin.panella@canonical.com-20140401151750-s6x05abaljde7s7m
Merge trunk r2185, resolving minor conflicts.
- files removed:
- pkg/maas-cluster/etc/maas/import_ephemerals
- files modified:
- pkg/maas-cluster/provisioningserver/config.py
expand all
collapse all
added
removed
