← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to cmd/jujud/machine.go

  • Committer: Brad Crittenden
  • Date: 2013-03-06 14:58:46 UTC
  • mfrom: (956.3.5 237-clientserver)
  • mto: This revision was merged to the branch mainline in revision 988.
  • Revision ID: bac@canonical.com-20130306145846-j62pndcb2j1c3rgy
Merged Roger's attempt at removing the import loop.  One still exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/jujud/machine.go
9
9
        _ "launchpad.net/juju-core/environs/openstack"
10
10
        "launchpad.net/juju-core/log"
11
11
        "launchpad.net/juju-core/state"
12
 
        "launchpad.net/juju-core/state/api"
 
12
        "launchpad.net/juju-core/state/apiserver"
13
13
        "launchpad.net/juju-core/worker"
14
14
        "launchpad.net/juju-core/worker/firewaller"
15
15
        "launchpad.net/juju-core/worker/provisioner"
174
174
                return &fatalError{"configuration does not have state server cert/key"}
175
175
        }
176
176
        log.Printf("cmd/jujud: running API server job")
177
 
        srv, err := api.NewServer(st, fmt.Sprintf(":%d", conf.APIPort), conf.StateServerCert, conf.StateServerKey)
 
177
        srv, err := apiserver.NewServer(st, fmt.Sprintf(":%d", conf.APIPort), conf.StateServerCert, conf.StateServerKey)
178
178
        if err != nil {
179
179
                return err
180
180
        }