← Back to branch summary

~juju-qa/ubuntu/yakkety/juju/2.0-beta10

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/common/machine.go

  • Committer: Martin Packman
  • Date: 2016-06-28 11:15:00 UTC
  • mfrom: (1.4.3)
  • Revision ID: martin.packman@canonical.com-20160628111500-3vabmx2cls3plbp1
Merge new upstream source 2.0~beta10

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/common/machine.go
30
30
                return state.JobHostUnits, nil
31
31
        case multiwatcher.JobManageModel:
32
32
                return state.JobManageModel, nil
33
 
        case multiwatcher.JobManageNetworking:
34
 
                return state.JobManageNetworking, nil
35
33
        default:
36
34
                return -1, errors.Errorf("invalid machine job %q", job)
37
35
        }