← Back to branch summary

~allenap/maas/device-discovery-updates-2.1

« back to all changes in this revision

Viewing changes to docs/version.rst

  • Committer: Gavin Panella
  • Date: 2016-11-10 14:26:37 UTC
  • mto: This revision was merged to the branch mainline in revision 5552.
  • Revision ID: gavin.panella@canonical.com-20161110142637-josv3zgi6334zsmn
Backport r5546 from lp:maas: Add two capabilities: bridging-interface-ubuntu and bridging-automatic-ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
docs/version.rst
67
67
  Deploy nodes with custom network layout and configuration. Available since
68
68
  version 1.9 on Ubuntu deployments. See :ref:`networking` for more about this
69
69
  feature.
 
70
 
 
71
.. _cap_bridging-interface-ubuntu:
 
72
 
 
73
``bridging-interface-ubuntu``
 
74
  Deploy nodes, selectively configuring bridges on network interfaces.
 
75
  Available since 2.1 on Ubuntu deployments.
 
76
 
 
77
.. _cap_bridging-automatic-ubuntu:
 
78
 
 
79
``bridging-automatic-ubuntu``
 
80
  Deploy nodes, automatically configuring bridges on all interfaces.
 
81
  Available since 2.1 on Ubuntu deployments.