Merge lp://qastaging/~zulcss/horizon/horizon-pbr into lp://qastaging/~openstack-ubuntu-testing/horizon/havana
Proposed by
Chuck Short
| Status: | Merged |
|---|---|
| Merged at revision: | 153 |
| Proposed branch: | lp://qastaging/~zulcss/horizon/horizon-pbr |
| Merge into: | lp://qastaging/~openstack-ubuntu-testing/horizon/havana |
| Diff against target: |
92 lines (+34/-17) 3 files modified
debian/changelog (+8/-0) debian/control (+2/-1) debian/patches/ubuntu_local_settings.patch (+24/-16) |
| To merge this branch: | bzr merge lp://qastaging/~zulcss/horizon/horizon-pbr |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| James Page (james-page) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Depends look OK - patch looks wrong:
45 -+DEBUG = False
46 ++DEBUG = Fase
and
56 -- 'BACKEND' : 'django.
57 -+ 'BACKEND' : 'django.
58 -+ 'LOCATION' : '127.0.0.1:11211'
59 + 'BACKEND' : 'django.
60 ++ 'LOCATION': '127.0.0.1:11211'