Merge lp:~james-page/charms/trusty/glance/tox into lp:~openstack-charmers-archive/charms/trusty/glance/next
Proposed by
James Page
Status: | Merged |
---|---|
Approved by: | Billy Olsen |
Approved revision: | 140 |
Merged at revision: | 139 |
Proposed branch: | lp:~james-page/charms/trusty/glance/tox |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/glance/next |
Diff against target: |
255 lines (+90/-23) 10 files modified
.bzrignore (+2/-0) .testr.conf (+8/-0) requirements/requirements-precise.txt (+6/-0) requirements/requirements-trusty.txt (+6/-0) requirements/test-requirements.txt (+7/-0) tests/basic_deployment.py (+1/-1) tox.ini (+35/-0) unit_tests/test_actions_git_reinstall.py (+3/-0) unit_tests/test_actions_openstack_upgrade.py (+3/-1) unit_tests/test_glance_relations.py (+19/-21) |
To merge this branch: | bzr merge lp:~james-page/charms/trusty/glance/tox |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Billy Olsen | Approve | ||
Review via email: mp+271075@code.launchpad.net |
To post a comment you must log in.
charm_lint_check #10045 glance-next for james-page mp271075
LINT OK: passed
Build: http:// 10.245. 162.77: 8080/job/ charm_lint_ check/10045/