Merge lp://qastaging/~james-page/charms/trusty/swift-storage/lp1531102-trunk into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Proposed by
James Page
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~james-page/charms/trusty/swift-storage/lp1531102-trunk | ||||
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk | ||||
Diff against target: |
584 lines (+285/-36) 8 files modified
charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) charmhelpers/contrib/openstack/utils.py (+21/-17) charmhelpers/contrib/storage/linux/loopback.py (+0/-10) charmhelpers/core/host.py (+12/-1) charmhelpers/core/hugepage.py (+2/-0) tests/charmhelpers/contrib/openstack/amulet/deployment.py (+100/-1) tests/charmhelpers/contrib/openstack/amulet/utils.py (+25/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~james-page/charms/trusty/swift-storage/lp1531102-trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Needs Fixing | ||
Review via email: mp+281873@code.qastaging.launchpad.net |
Commit message
Resync helpers
Description of the change
Resync stable helpers to resolve liberty point release version detection problems.
To post a comment you must log in.
Unmerged revisions
- 77. By James Page
-
Resync charm-helpers
charm_unit_test #15629 swift-storage for james-page mp281873
UNIT FAIL: unit-test failed
UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.
Full unit test output: http:// paste.ubuntu. com/14430274/ 10.245. 162.77: 8080/job/ charm_unit_ test/15629/
Build: http://