Merge lp://qastaging/~niedbalski/charms/trusty/swift-storage/mr-corrected-1276911 into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Proposed by
Jorge Niedbalski
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 31 | ||||
| Proposed branch: | lp://qastaging/~niedbalski/charms/trusty/swift-storage/mr-corrected-1276911 | ||||
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk | ||||
| Diff against target: |
26 lines (+3/-2) 2 files modified
hooks/swift_storage_utils.py (+1/-1) unit_tests/test_swift_storage_utils.py (+2/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~niedbalski/charms/trusty/swift-storage/mr-corrected-1276911 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Chris Glass (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
There is a divergence on the trunk code between the changes made by me ( lp:~niedbalski/charms/precise/swift-storage/add-fstab-persist) and the changes proposed on lp:~james-page/charms/trusty/swift-storage/fstab-persist.
This will cause the charm to write an incorrect fstab entry.
To post a comment you must log in.
Revision history for this message
| Chris Glass (tribaal) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
(small comment - I linked your bug report from the commit message, but it would be nice if you did so yourself next time).