← Back to branch summary

~rogpeppe/juju-core/323-machineagent-api-client

« back to all changes in this revision

Viewing changes to cmd/juju/ssh.go

  • Committer: Tarmac
  • Author(s): Tim Penhey
  • Date: 2013-06-17 22:06:54 UTC
  • mfrom: (1274.3.10 instance-id)
  • Revision ID: tarmac-20130617220654-1d7y34f00629h8cv
[r=thumper] Move state.InstanceId to instance.Id

Very mechanical change, just imports, and occasional variable renames.

https://codereview.appspot.com/10325043/

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/ssh.go
7
7
        "errors"
8
8
        "fmt"
9
9
        "launchpad.net/juju-core/cmd"
 
10
        "launchpad.net/juju-core/instance"
10
11
        "launchpad.net/juju-core/juju"
11
12
        "launchpad.net/juju-core/log"
12
13
        "launchpad.net/juju-core/state"
105
106
        for _ = range w.Changes() {
106
107
                if instid, ok := machine.InstanceId(); ok {
107
108
                        w.Stop()
108
 
                        inst, err := c.Environ.Instances([]state.InstanceId{instid})
 
109
                        inst, err := c.Environ.Instances([]instance.Id{instid})
109
110
                        if err != nil {
110
111
                                return "", err
111
112
                        }