← Back to branch summary

~allenap/maas/fix-migration-0139-upgrade-from-1.8.1-to-1.9--1.8

~allenap/maas/fix-migration-0139-upgrade-from-1.8.1-to-1.9--1.8

Viewing all changes in revision 4021.1.1.

Committer: Gavin Panella
Date: 2015-07-15 11:55:03 UTC
mto: This revision was merged to the branch mainline in revision 4022.
Revision ID: gavin.panella@canonical.com-20150715115503-yed74o3k7ahkipni

Merge r4076 from lp:maas, resolving some tricky conflicts.

files added:
src/maasserver/migrations/0150_power_parameters_and_state_updated_field.py

files modified:
HACKING.txt

src/maasserver/models/node.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/timestampedmodel.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/testing/factory.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/node.py

src/provisioningserver/pserv_services/node_power_monitor_service.py

src/provisioningserver/pserv_services/tests/test_node_power_monitor_service.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_power.py

Show diffs side-by-side

added added

removed removed

src/maasserver/migrations/0150_power_parameters_and_state_updated_field.py

src/maasserver/models/node.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/timestampedmodel.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/testing/factory.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/node.py

src/provisioningserver/pserv_services/node_power_monitor_service.py

src/provisioningserver/pserv_services/tests/test_node_power_monitor_service.py

src/provisioningserver/rpc/power.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_power.py

Older »