← Back to branch summary

~ddellav/charms/trusty/nova-compute/upgrade-action

~ddellav/charms/trusty/nova-compute/upgrade-action

Viewing all changes in revision 169.

Committer: David Della Vecchia
Date: 2015-10-06 16:58:22 UTC
mfrom: (162.1.6 nova-compute)
Revision ID: ddv@canonical.com-20151006165822-liy8tjx33qs6itpv

Fixing merge conflict with do_openstack_upgrade

files added:
hooks/lxd-relation-changed

hooks/lxd-relation-joined

templates/git/nova-compute-lxd.conf

files modified:
hooks/nova_compute_hooks.py

hooks/nova_compute_utils.py

metadata.yaml

unit_tests/test_nova_compute_hooks.py

unit_tests/test_nova_compute_utils.py

unit_tests/test_utils.py

Show diffs side-by-side

added added

removed removed

hooks/lxd-relation-changed@

hooks/lxd-relation-joined@

hooks/nova_compute_hooks.py

hooks/nova_compute_utils.py

templates/git/nova-compute-lxd.conf

unit_tests/test_nova_compute_hooks.py

unit_tests/test_nova_compute_utils.py

unit_tests/test_utils.py

Older »