Merge lp://staging/~gandelman-a/ubuntu/saucy/horizon/apache24 into lp://staging/~ubuntu-server-dev/horizon/havana
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 164 |
| Proposed branch: | lp://staging/~gandelman-a/ubuntu/saucy/horizon/apache24 |
| Merge into: | lp://staging/~ubuntu-server-dev/horizon/havana |
| Diff against target: |
171 lines (+67/-14) 8 files modified
debian/changelog (+6/-0) debian/control (+1/-0) debian/openstack-dashboard.dirs (+2/-0) debian/openstack-dashboard.install (+1/-1) debian/openstack-dashboard.postinst (+23/-5) debian/openstack-dashboard.postrm (+24/-4) debian/openstack-dashboard.preinst (+6/-0) debian/rules (+4/-4) |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/ubuntu/saucy/horizon/apache24 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Server Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Adds apache 2.4 transition. To avoid needing to carry a delta in the Cloud Archive, it also preserves apache 2.2. compatibility.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
