Merge lp:ubuntu/vivid/ironic into lp:~d-jj/ironic/ironic-conductor
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:ubuntu/vivid/ironic |
| Merge into: | lp:~d-jj/ironic/ironic-conductor |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp:ubuntu/vivid/ironic |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| JJ Asghar | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-03-16.
Description of the change
The ironic conductor init script doesn't point to the conductor application, it points to the ironic-api. This fixes that.
Unmerged revisions
- 15. By Chuck Short
-
* New upstream milestone release:
- d/control: Align with upstream dependencies
- d/p/fix-requirements. patch: Dropped no longer needed. - 14. By Chuck Short
-
* New upstream release.
+ d/control:
- Align with upstream dependencies.
- Add dh-python to build-dependencies.
- Add psmisc as a dependency. (LP: #1358820)
+ d/p/fix-requirements. patch: Rediffed.
+ d/ironic-conductor. init.in: Fixed typos in LSB headers,
thanks to JJ Asghar. (LP: #1429962)
