Merge lp:~axwalk/juju-core/lp1317267-manual-addmachine1dot18 into lp:~go-bot/juju-core/trunk
Proposed by
Andrew Wilkins
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andrew Wilkins | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2708 | ||||
Proposed branch: | lp:~axwalk/juju-core/lp1317267-manual-addmachine1dot18 | ||||
Merge into: | lp:~go-bot/juju-core/trunk | ||||
Diff against target: |
15 lines (+4/-1) 1 file modified
environs/manual/provisioner.go (+4/-1) |
||||
To merge this branch: | bzr merge lp:~axwalk/juju-core/lp1317267-manual-addmachine1dot18 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+218746@code.launchpad.net |
Commit message
environs/manual: use old AddMAchines API
Manual provisioning was implicitly changed
to use the new AddMachinesV2 client API,
with no backwards compatibility failover.
I've changed it to explicitly use the old
API, since we do not require anything of
the new one.
Fixes lp:1317267
Description of the change
environs/manual: use old AddMAchines API
Manual provisioning was implicitly changed
to use the new AddMachinesV2 client API,
with no backwards compatibility failover.
I've changed it to explicitly use the old
API, since we do not require anything of
the new one.
Fixes lp:1317267
To post a comment you must log in.
Reviewers: mp+218746_ code.launchpad. net,
Message:
Please take a look.
Description:
environs/manual: use old AddMAchines API
Manual provisioning was implicitly changed
to use the new AddMachinesV2 client API,
with no backwards compatibility failover.
I've changed it to explicitly use the old
API, since we do not require anything of
the new one.
Fixes lp:1317267
https:/ /code.launchpad .net/~axwalk/ juju-core/ lp1317267- manual- addmachine1dot1 8/+merge/ 218746
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/95150043/
Affected files (+3, -1 lines): manual/ provisioner. go
A [revision details]
M environs/
Index: [revision details] 20140508054219- e6ylw5luw58d6zh x
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: environs/ manual/ provisioner. go manual/ provisioner. go' manual/ provisioner. go 2014-04-07 10:05:04 +0000 manual/ provisioner. go 2014-05-08 06:55:15 +0000
=== modified file 'environs/
--- environs/
+++ environs/
@@ -130,7 +130,7 @@
func recordMachineIn State( AddMachineParam s) (machineId AddMachines( []params. AddMachineParam s{machineParams }) AddMachines1dot 18([]params. AddMachineParam s{machineParams })
client *api.Client, machineParams params.
string, err error) {
- results, err :=
client.
+ results, err :=
client.
if err != nil {
return "", err
}