Merge lp://qastaging/~gandelman-a/ubuntu/raring/keystone/lp1158563 into lp://qastaging/~openstack-ubuntu-testing/keystone/grizzly
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Approved by: | Chuck Short |
| Approved revision: | 191 |
| Merged at revision: | 191 |
| Proposed branch: | lp://qastaging/~gandelman-a/ubuntu/raring/keystone/lp1158563 |
| Merge into: | lp://qastaging/~openstack-ubuntu-testing/keystone/grizzly |
| Diff against target: |
80 lines (+25/-8) 2 files modified
debian/changelog (+7/-0) debian/patches/sql_connection.patch (+18/-8) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/ubuntu/raring/keystone/lp1158563 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Openstack Ubuntu Testers | Pending | ||
|
Review via email:
|
|||
Description of the change
We defaulted to SQL backend for Ec2 and tokens in Essex, Folsom. Continue to do so here, and also default the new trusts manager to use its SQL backend as well.
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
