← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/environs/config.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/environs/config.go
14
14
 
15
15
var logger = loggo.GetLogger("juju.environs")
16
16
 
17
 
// disallowedWithNew holds those attributes
18
 
// that can not be set in an initial environment
19
 
// config used to bootstrap (they must only be set
20
 
// on a running environment where appropriate
21
 
// validation can be performed).
22
 
var disallowedWithBootstrap = []string{
23
 
        config.StorageDefaultBlockSourceKey,
24
 
}
25
 
 
26
17
// ProviderRegistry is an interface that provides methods for registering
27
18
// and obtaining environment providers by provider name.
28
19
type ProviderRegistry interface {