Merge lp://staging/~gandelman-a/charms/precise/swift-proxy/delay_auth into lp://staging/~openstack-charmers/charms/precise/swift-proxy/ha-support
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merged at revision: | 48 |
| Proposed branch: | lp://staging/~gandelman-a/charms/precise/swift-proxy/delay_auth |
| Merge into: | lp://staging/~openstack-charmers/charms/precise/swift-proxy/ha-support |
| Diff against target: |
57 lines (+9/-2) 5 files modified
config.yaml (+4/-0) hooks/swift_utils.py (+2/-1) revision (+1/-1) templates/essex/proxy-server.conf (+1/-0) templates/grizzly/proxy-server.conf (+1/-0) |
| To merge this branch: | bzr merge lp://staging/~gandelman-a/charms/precise/swift-proxy/delay_auth |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Page | Approve | ||
|
Review via email:
|
|||
Description of the change
Adds optional delay_auth_decision config option, which defaults to True. Must be enabled for container ACLs to work /w Keystone, which is required for Juju's osapi swift provider to function
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
LGTM - merge away please.