← Back to branch summary

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

« back to all changes in this revision

Viewing changes to cmd/jujud/main.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/jujud/main.go
9
9
        "path/filepath"
10
10
)
11
11
 
12
 
// When we import an environment provider implementation
13
 
// here, it will register itself with environs.
 
12
// Import the providers.
14
13
import (
15
 
        _ "launchpad.net/juju-core/environs/ec2"
16
 
        _ "launchpad.net/juju-core/environs/openstack"
 
14
        _ "launchpad.net/juju-core/environs/all"
17
15
)
18
16
 
19
17
var jujudDoc = `