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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/client/backend.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:
9
9
        "gopkg.in/juju/names.v2"
10
10
 
11
11
        "github.com/juju/juju/constraints"
12
 
        "github.com/juju/juju/core/description"
13
12
        "github.com/juju/juju/environs/config"
14
13
        "github.com/juju/juju/instance"
15
14
        "github.com/juju/juju/network"
 
15
        "github.com/juju/juju/permission"
16
16
        "github.com/juju/juju/state"
17
17
        "github.com/juju/juju/status"
18
18
)
59
59
        Charm(*charm.URL) (*state.Charm, error)
60
60
        LatestPlaceholderCharm(*charm.URL) (*state.Charm, error)
61
61
        AddRelation(...state.Endpoint) (*state.Relation, error)
62
 
        AddModelUser(string, state.UserAccessSpec) (description.UserAccess, error)
63
 
        AddControllerUser(state.UserAccessSpec) (description.UserAccess, error)
 
62
        AddModelUser(string, state.UserAccessSpec) (permission.UserAccess, error)
 
63
        AddControllerUser(state.UserAccessSpec) (permission.UserAccess, error)
64
64
        RemoveUserAccess(names.UserTag, names.Tag) error
65
65
        Watch() *state.Multiwatcher
66
66
        AbortCurrentUpgrade() error