Merge lp://qastaging/~gandelman-a/charms/precise/keystone/version_fixes into lp://qastaging/~openstack-charmers/charms/precise/keystone/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 56 |
| Proposed branch: | lp://qastaging/~gandelman-a/charms/precise/keystone/version_fixes |
| Merge into: | lp://qastaging/~openstack-charmers/charms/precise/keystone/ha-support |
| Diff against target: |
84 lines (+12/-29) 1 file modified
hooks/lib/openstack_common.py (+12/-29) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/charms/precise/keystone/version_fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
| Adam Gandelman (community) | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
Various fixes to version handling, also adds havana.
Once approved here, I will merge changes into lp:~openstack-charmers/openstack-charm-helpers/ha-helpers and sync across all current branches that pull from there.
To post a comment you must log in.
Revision history for this message
| James Page (james-page) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Adam
The apt package has a upstream_version helper that might be useful in this case - might be a bit neater than splitting the epoch off manually.