← Back to branch summary

~blake-rouse/maas/is-importing-2.1

« back to all changes in this revision

Viewing changes to src/maasserver/api/version.py

  • Committer: LaMont Jones
  • Date: 2016-12-07 12:59:10 UTC
  • mfrom: (5561 2.1)
  • mto: This revision was merged to the branch mainline in revision 5563.
  • Revision ID: lamont@canonical.com-20161207125910-fow7gg8v9bo0s1iq
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/maasserver/api/version.py
21
21
CAP_DEVICES_MANAGEMENT = 'devices-management'
22
22
CAP_STORAGE_DEPLOYMENT_UBUNTU = 'storage-deployment-ubuntu'
23
23
CAP_NETWORK_DEPLOYMENT_UBUNTU = 'network-deployment-ubuntu'
 
24
CAP_BRIDGING_INTERFACE_UBUNTU = 'bridging-interface-ubuntu'
 
25
CAP_BRIDGING_AUTOMATIC_UBUNTU = 'bridging-automatic-ubuntu'
24
26
 
25
27
API_CAPABILITIES_LIST = [
26
28
    CAP_NETWORKS_MANAGEMENT,
29
31
    CAP_DEVICES_MANAGEMENT,
30
32
    CAP_STORAGE_DEPLOYMENT_UBUNTU,
31
33
    CAP_NETWORK_DEPLOYMENT_UBUNTU,
 
34
    CAP_BRIDGING_INTERFACE_UBUNTU,
 
35
    CAP_BRIDGING_AUTOMATIC_UBUNTU,
32
36
    ]
33
37
 
34
38