← Back to branch summary

~rogpeppe/juju-core/438-local-instance-Addresses

« back to all changes in this revision

Viewing changes to provider/openstack/config.go

  • Committer: John Arbash Meinel
  • Date: 2013-09-15 07:36:52 UTC
  • mfrom: (1817 juju-core)
  • mto: This revision was merged to the branch mainline in revision 1882.
  • Revision ID: john@arbash-meinel.com-20130915073652-80jnupeguvr1klea
Merge trunk, resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
provider/openstack/config.go
5
5
 
6
6
import (
7
7
        "fmt"
 
8
        "net/url"
 
9
 
8
10
        "launchpad.net/goose/identity"
 
11
 
9
12
        "launchpad.net/juju-core/environs/config"
10
13
        "launchpad.net/juju-core/log"
11
14
        "launchpad.net/juju-core/schema"
12
 
        "net/url"
13
15
)
14
16
 
15
17
var configFields = schema.Fields{