Merge lp:~jason-hobbs/juju-deployer/juju-deployer-populate-first into lp:juju-deployer
Status: | Rejected |
---|---|
Rejected by: | Haw Loeung |
Proposed branch: | lp:~jason-hobbs/juju-deployer/juju-deployer-populate-first |
Merge into: | lp:juju-deployer |
Diff against target: |
545 lines (+255/-41) 12 files modified
Makefile (+5/-1) deployer/action/importer.py (+137/-15) deployer/cli.py (+7/-0) deployer/deployment.py (+40/-8) deployer/env/go.py (+27/-0) deployer/env/py.py (+6/-0) deployer/service.py (+11/-4) deployer/tests/test_charm.py (+8/-0) deployer/tests/test_deployment.py (+7/-9) deployer/tests/test_diff.py (+3/-2) deployer/tests/test_guiserver.py (+3/-2) deployer/tests/test_importer.py (+1/-0) |
To merge this branch: | bzr merge lp:~jason-hobbs/juju-deployer/juju-deployer-populate-first |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
juju-deployers | Pending | ||
Review via email: mp+261457@code.launchpad.net |
Description of the change
Update of lp:~raharper/juju-deployer/populate-first - this merges a newer trunk. It also rename's rharper's add_machine to 'add_specific_
Unmerged revisions
- 157. By Jason Hobbs
-
Timeout when acquiring a node takes too long.
- 156. By Jason Hobbs
-
Use charm series if one provided by the charm.
This fixes deploying mixed Ubuntu/Windows bundles.
- 155. By Jason Hobbs
-
Specify series when adding a specific machine.
- 154. By Jason Hobbs
-
Force service sorting, and log it.
- 153. By Jason Hobbs
-
Pull in lutostag's test fixes.
- 152. By Jason Hobbs
-
Fix syntax error and unit test.
- 151. By Jason Hobbs
-
Merge trunk.
- 150. By Ryan Harper
-
Allow nested placement when target uses maas= placement. Fix up debugging log message during deploy_services.
- 149. By Ryan Harper
-
Modify depoyment.
deploy_ services to bring services with placement and multiple units online to ensure subsequent services which placement can target previously deployed service units. Update get_machine to handle container placement. - 148. By Ryan Harper
-
Fix typo