Merge lp://qastaging/~tvansteenburgh/charms/precise/keystone/fix-tests into lp://qastaging/~openstack-charmers-archive/charms/precise/keystone/trunk
Proposed by
Tim Van Steenburgh
| Status: | Merged |
|---|---|
| Merged at revision: | 67 |
| Proposed branch: | lp://qastaging/~tvansteenburgh/charms/precise/keystone/fix-tests |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/precise/keystone/trunk |
| Diff against target: |
59 lines (+14/-2) 2 files modified
Makefile (+10/-2) config.yaml (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~tvansteenburgh/charms/precise/keystone/fix-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Charles Butler (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Fix tests, proof.
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
+1 LGTM