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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/ec2/environ.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
154
154
        validator := constraints.NewValidator()
155
155
        validator.RegisterConflicts(
156
156
                []string{constraints.InstanceType},
157
 
                []string{constraints.Mem, constraints.CpuCores, constraints.CpuPower})
 
157
                []string{constraints.Mem, constraints.Cores, constraints.CpuPower})
158
158
        validator.RegisterUnsupported(unsupportedConstraints)
159
159
        instTypeNames := make([]string, len(allInstanceTypes))
160
160
        for i, itype := range allInstanceTypes {