← 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/bootstrap.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/bootstrap.go
15
15
 
16
16
// BootstrapParams holds the parameters for bootstrapping an environment.
17
17
type BootstrapParams struct {
18
 
        // EnvironConstraints are merged with the bootstrap constraints
 
18
        // ModelConstraints are merged with the bootstrap constraints
19
19
        // to choose the initial instance, and will be stored in the new
20
20
        // environment's state.
21
 
        EnvironConstraints constraints.Value
 
21
        ModelConstraints constraints.Value
22
22
 
23
 
        // BootstrapConstraints, in conjunction with EnvironConstraints,
 
23
        // BootstrapConstraints, in conjunction with ModelConstraints,
24
24
        // are used to choose the initial instance. BootstrapConstraints
25
25
        // will not be stored in state for the environment.
26
26
        BootstrapConstraints constraints.Value