lp:~jason-hobbs/juju-deployer/juju-deployer-oil+upstream-r152

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~oil-ci/juju-deployer/juju-deployer-oil at revision 161

Larry Michel (community): Approve on 2015-08-10

Diff: 831 lines (+234/-122)

15 files modified

deployer/action/importer.py (+20/-29)
deployer/charm.py (+33/-2)
deployer/config.py (+5/-5)
deployer/deployment.py (+3/-4)
deployer/env/base.py (+7/-1)
deployer/service.py (+46/-45)
deployer/tests/base.py (+36/-0)
deployer/tests/test_charm.py (+24/-0)
deployer/tests/test_data/v4/container-existing-machine.yaml (+1/-1)
deployer/tests/test_data/v4/placement-invalid-number.yaml (+8/-0)
deployer/tests/test_deployment.py (+28/-15)
deployer/tests/test_guiserver.py (+7/-3)
deployer/tests/test_importer.py (+11/-15)
deployer/vcs.py (+4/-1)
setup.py (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

161. By Jason Hobbs on 2015-08-10

Merge upstream r152.

160. By Greg Lutostanski on 2015-07-10

update changelog

159. By Jason Hobbs on 2015-07-08

Sort placed services first.

158. By Greg Lutostanski on 2015-07-07

add debian directory

157. By Jason Hobbs on 2015-07-06

Timeout when acquiring a node takes too long.

156. By Jason Hobbs on 2015-06-24

Use charm series if one provided by the charm.

This fixes deploying mixed Ubuntu/Windows bundles.

155. By Jason Hobbs on 2015-06-11

Specify series when adding a specific machine.

154. By Jason Hobbs on 2015-06-10

Force service sorting, and log it.

153. By Jason Hobbs on 2015-06-09

Pull in lutostag's test fixes.

152. By Jason Hobbs on 2015-06-09

Fix syntax error and unit test.