lp:~henninge/juju-core/providertype-containertype-machineid

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~go-bot/juju-core/trunk

Juju Engineering: Pending requested 2013-08-10

Diff: 557 lines (+191/-79)

17 files modified

.bzrignore (+3/-0)
cmd/juju/addmachine.go (+23/-10)
cmd/juju/addmachine_test.go (+45/-41)
cmd/juju/bootstrap.go (+1/-1)
cmd/jujud/machine.go (+1/-1)
cmd/names.go (+1/-1)
environs/azure/environprovider.go (+2/-1)
environs/config.go (+11/-9)
environs/dummy/environs.go (+2/-1)
environs/ec2/ec2.go (+2/-1)
environs/local/local_test.go (+1/-1)
environs/maas/environprovider.go (+2/-1)
environs/openstack/provider.go (+2/-1)
environs/provider/provider.go (+28/-6)
environs/provider/provider_test.go (+33/-0)
names/machine.go (+12/-4)
names/machine_test.go (+22/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1647. By Henning Eggers on 2013-08-10

Satisfy linter.

1646. By Henning Eggers on 2013-08-10

Merged master.

1645. By Henning Eggers on 2013-08-10

Fix test.

1644. By Henning Eggers on 2013-08-10

Revert premature addition of availabilty zone code, will be readded later.

1643. By Henning Eggers on 2013-08-10

Modernize test.

1642. By Henning Eggers on 2013-08-10

Fix container arg parsing in add-machine command.

1641. By Henning Eggers on 2013-08-10

Add IsRealMachine.

1640. By Henning Eggers on 2013-08-10

Rename to ProviderType and update all uses.

1639. By Henning Eggers on 2013-08-09

Parse provider names.

1638. By Henning Eggers on 2013-08-09

Add provider specific machine config.