Merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Proposed by
Corey Bryant
Status: | Merged |
---|---|
Merged at revision: | 123 |
Proposed branch: | lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
1288 lines (+811/-65) 29 files modified
.bzrignore (+1/-0) Makefile (+4/-2) README.md (+88/-3) actions.yaml (+2/-0) actions/git_reinstall.py (+45/-0) config.yaml (+16/-0) hooks/charmhelpers/contrib/openstack/utils.py (+4/-1) hooks/nova_compute_hooks.py (+12/-2) hooks/nova_compute_utils.py (+191/-2) templates/git/nova-compute-kvm.conf (+4/-0) templates/git/nova-compute-lxc.conf (+4/-0) templates/git/nova-compute-qemu.conf (+4/-0) templates/git/nova-compute-vmware.conf (+2/-0) templates/git/nova-compute-xen.conf (+4/-0) templates/git/nova_sudoers (+4/-0) templates/git/nova_tgt.conf (+1/-0) templates/git/upstart/nova-compute.upstart (+27/-0) tests/10-basic-precise-essex (+0/-9) tests/11-basic-precise-folsom (+0/-17) tests/12-basic-precise-grizzly (+0/-11) tests/13-basic-precise-havana (+0/-11) tests/16-basic-trusty-icehouse-git (+9/-0) tests/17-basic-trusty-juno (+11/-0) tests/18-basic-trusty-juno-git (+12/-0) tests/basic_deployment.py (+23/-1) unit_tests/__init__.py (+1/-0) unit_tests/test_actions_git_reinstall.py (+96/-0) unit_tests/test_nova_compute_hooks.py (+57/-0) unit_tests/test_nova_compute_utils.py (+189/-6) |
To merge this branch: | bzr merge lp://qastaging/~corey.bryant/charms/trusty/nova-compute/git |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenStack Charmers | Pending | ||
Review via email:
|
To post a comment you must log in.
charm_lint_check #3331 nova-compute-next for corey.bryant mp255945
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/3331/