Merge lp:~ltrager/maas/lp1636858_2.0 into lp:~maas-committers/maas/trunk

[Lee Trager]

Backport from 2.1.1 - If the power_parameters are the empty string set them to an empty dictionary, don't use json.loads

Reviewed in - https://code.launchpad.net/~ltrager/maas/lp1636858/+merge/309392

=== modified file 'Makefile'
--- Makefile	2016-10-17 06:38:56 +0000
+++ Makefile	2016-10-26 23:39:26 +0000
@@ -588,7 +588,7 @@
 
 # Old names.
 PACKAGING := $(abspath ../packaging.trunk)
-PACKAGING_BRANCH := lp:~maas-maintainers/maas/packaging
+PACKAGING_BRANCH := lp:~maas-maintainers/maas/packaging-2.0
 
 packaging-tree = $(PACKAGING)
 packaging-branch = $(PACKAGING_BRANCH)

=== modified file 'buildout.cfg'
=== modified file 'docs/about.rst'
--- docs/about.rst	2016-04-11 16:23:26 +0000
+++ docs/about.rst	2016-10-26 23:39:26 +0000
@@ -1,6 +1,15 @@
 About this documentation
 ========================
 
+This is API and developer documentation only. MAAS 2.0 user documentation is
+published on `http://maas.io_` and its source is found on `GitHub_`.
+
+.. _http://maas.io:
+  http://maas.io/docs/
+
+.. _GitHub:
+  https://github.com/CanonicalLtd/maas-docs
+
 This is the documentation for Canonical's MAAS software. If you aren't
 sure what that is, you should probably skip everything else and head
 straight to the :ref:`orientation` section where it is explained.

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-09-27 22:26:08 +0000
+++ docs/changelog.rst	2016-10-26 23:39:26 +0000
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+<<<<<<< TREE
 2.1.0 Alpha 4
 =============
 
@@ -399,12 +400,532 @@
   http://launchpad.net/bugs/1618572
 
 
+=======
+2.0.1
+=====
+
+Issues fixed in this release
+----------------------------
+
+LP: #1636251    resolv.conf search path doesn't match the domain for the host.
+
+LP: #1615686    Single-IP dynamic ranges resulted in internal errors.
+
+2.0.0
+=====
+
+Important announcements
+----------------------
+
+**MAAS 2.0 supported on Ubuntu 16.04 LTS (Xenial)**
+  MAAS version 2.0 is supported on Ubuntu 16.04 LTS. MAAS 2.0 and greater
+  will NOT be supported on Ubuntu 14.04 LTS. The latest MAAS 1.9 point release
+  will continue to be supported on Ubuntu 14.04 LTS (Trusty) until it reaches
+  end-of-life.
+
+  Upgrades are supported for users running Ubuntu 14.04 systems running
+  MAAS 1.9 or earlier. Upon upgrading to Ubuntu 16.04, the MAAS
+  database and configuration will be seamlessly migrated to the supported
+  MAAS version.
+
+  Please see the “Other Notable Changes” section below for more details
+  regarding the reasons for this change.
+
+**Terminology Changes**
+  Cluster controllers have been renamed to rack controllers.
+
+  Starting from MAAS 2.0, MAAS cluster controllers have been deprecated,
+  along with the legacy ``nodegroups`` API. The new API endpoint is
+  ``rackcontrollers``, which provides feature parity with earlier versions
+  of MAAS.
+
+  For more information on rack controllers, refer to the `Major new Features`
+  section bellow or refer to :ref:`rack-configuration`.
+
+**API 1.0 has been deprecated, introducing API 2.0**
+  Starting from MAAS 2.0, the MAAS REST API version 1.0 has been deprecated.
+  MAAS 2.0 drops support for the legacy 1.0 API, in favor of API version 2.0.
+  With the introduction of the new API version, various endpoints have now
+  been deprecated, and new end-points have been introduced. API users will
+  need to update their client tools to reflect the changes.
+
+  For more information on API 2.0, refer to :ref:`API documentation <region-controller-api>`.
+
+**Static IP ranges have been deprecated**
+  Starting from MAAS 2.0, static IP ranges (previously found on the cluster
+  interface page) have been deprecated. MAAS now assumes total control of a
+  subnet. MAAS will automatically assign IP addresses to deployed machines,
+  as long as those IP addresses are not within a dynamic or a reserved
+  IP range. Users are now only required to specify one or more dynamic ranges
+  per subnet. Dynamic ranges are used for auto-enlistment, commissioning, and
+  any other systems configured for DHCP. IP addresses in-use for purposes such
+  as devices, default gateways, DNS servers, rack and region controllers, and
+  BMCs are automatically avoided when assigning IP addresses. Reserved IP
+  ranges may be added if MAAS should avoid certain ranges of IP addresses in
+  the subnet.
+
+**maas-region-controller-min has been renamed to maas-region-api**
+  The ``maas-region-controller-min`` package has been renamed to
+  ``maas-region-api``. This package provides API services for MAAS
+  (``maas-regiond``) and can be used to scale out the API front-end of
+  a MAAS region.
+
+**MAAS user creation been moved to 'maas' command**
+  Starting from MAAS 2.0, the ``maas`` command now provides the ability to
+  create admin users. The ``maas-region createadmin`` command has been
+  deprecated. New administrators should now be created with
+  ``maas createadmin``.
+
+**maas-provision command has been replaced**
+  The MAAS rack controller command-line interface (``maas-provision``) has
+  been replaced by the ``maas-rack`` command.
+
+**maas-region-admin command has been replaced with maas-region**
+  The MAAS region controller command-line interface (``maas-region-admin``)
+  has been replaced by the ``maas-region`` command. Note that this command
+  provides an interface to interact directly with Django, which should only be
+  used for debugging purposes.
+
+**Debian Installer is no longer installed or supported**
+  Because support for the Debian Installer (DI) has been dropped (as
+  of MAAS 1.9), MAAS no longer downloads DI-related files from simplestreams.
+  Upon upgrading to MAAS 2.0, DI-related files will be removed from the MAAS
+  region (and all rack controllers).
+
+
+Major new features
+------------------
+
+**MAAS Rack Controllers and High Availability**
+  Starting from MAAS 2.0, MAAS **cluster controllers** have been renamed to
+  **rack controllers**.
+
+  * The ``nodegroups`` and ``nodegroups/(group)/interfaces`` API endpoints
+    have been deprecated. In MAAS 2.0, the ``rackcontrollers`` interface
+    partially replaces this functionality. For defining dynamic and reserved
+    ranges, or specifying default gateways, use the ``subnets`` endpoint. For
+    enabling or disabling DHCP, use the ``fabrics/(fabric)/vlans`` endpoint.
+
+  * The **Clusters** tab is no longer available in the Web UI.
+    Controllers are now found under the **Nodes** tab, where each region
+    and/or rack controller can be found. Other cluster interface properties
+    have been moved to the Subnet and VLAN details pages under the **Networks**
+    tab.
+
+  * Machines no longer belong to a specific controller.
+    In earlier versions of MAAS, machines would directly assigned to a cluster
+    controller. The cluster controller that the machine belonged to would not
+    only perform DHCP for that machine, but also all the PXE booting and power
+    management.
+
+    In order to support high availability for rack controllers, (starting from
+    MAAS 2.0) machines no longer belong to a specific rack controller. The best
+    controller to manage a machine is now determined at runtime.
+
+  * DHCP is now configured per-VLAN.
+    In earlier versions of MAAS, DHCP was directly linked and configured
+    per cluster interface. As of MAAS 2.0, DHCP is now configured and managed
+    per-VLAN, which allows any rack controller to potentially provide DHCP in
+    a high-availability environment.
+
+  * Rack controllers have been enabled for high availability.
+    Starting from MAAS 2.0, rack controllers in the same VLAN become
+    candidates to manage DHCP, PXE/TFTP, and power control for machines on
+    the VLAN. MAAS now supports the concept of a **primary** and a
+    **secondary** rack controller. If a secondary controller determines that
+    the primary controller is unavailable, it will assume control of those
+    services.
+
+  * Added ``maas-rack support-dump`` command.
+    For increased support observability, users can now dump the contents of
+    several internal MAAS data structures by executing ``sudo maas-rack
+    support-dump``. This command will dump networking diagnostics, rack
+    configuration, and image information. Information can be restricted to a
+    particular category by using the ``--networking``, ``--config``, or
+    ``--images`` options.
+
+  * Rack controllers can now be found under the **Nodes** tab in the Web UI.
+    MAAS 2.0 Adds a new **Controllers** section under thee **Nodes** tab. This
+    section will now list all rack and region controllers. Under a rack
+    controller, the user will be able to see service tracking, connected VLANs,
+    rack interfaces and other relevant information.
+
+**Region Controller Redundancy (High Availability)**
+  Starting from MAAS 2.0, MAAS provides the ability to scale out (provide
+  redundancy for) the MAAS region controller API, HTTP server, and DNS. This
+  will allow administrators to set up multiple MAAS region controllers
+  (``maas-region-api``) against a common database, providing redundancy of
+  services.  With further manual configuration, users will be able to setup
+  the MAAS region controller in high availability mode.
+
+**New Networks Web UI**
+  MAAS 2.0 introduces a few new Web UI features that were not available in
+  previous versions of MAAS.
+
+   * Added fabric and space details pages.
+
+   * Added the ability to add and remove fabrics, spaces, subnets and VLANs.
+     This can be done using the actions menu on the **Networks** tab.
+
+     The ability to delete fabrics, spaces, subnets and VLANs is also available
+     from the details page for each respective object.
+
+**DNS Management**
+  MAAS 2.0 extends DNS management by adding the following features:
+
+  * Ability to create multiple DNS domains.
+  * Ability to add multiple records (``CNAME``, ``TXT``, ``MX``, ``SRV``) per
+    domain. (API only)
+  * Ability to select the domain for machines and devices.
+  * Ability to assign (additional) names to IP addresses. (API only)
+  * For deployed machines, ``A`` records continue to be created for
+    the IP of the PXE interface.
+  * Additional PTR records are now created for all non-PXE interfaces in
+    the form: ``<interface>.<machine fully-qualified-domain-name>``
+  * Reverse DNS is now generated for only the subnet specified, rather
+    than the parent /24 or /16. By default, `RFC2137`_ glue is provided
+    for networks smaller than /24. This can be disabled or changed
+    on a per-subnet basis via the API.
+
+.. _RFC2137:
+  https://tools.ietf.org/html/rfc2137
+
+**IP Ranges**
+  Previous versions of MAAS used the concepts of a **dynamic range** and
+  **static range**, which were properties of each cluster interface. This
+  has been redesigned for MAAS 2.0 as follows:
+
+  * Dynamic ranges have been migrated from earlier MAAS releases as-is.
+
+  * Because static ranges have been removed from MAAS, each static
+    range has been migrated to one or more reserved ranges, which
+    represent the opposite of the previous static range. (MAAS now
+    assumes it has full control of each managed subnet, and is free
+    to assign IP addresses as it sees fit, unless told otherwise.)
+
+    For example, if in an earlier MAAS release a cluster interface was
+    configured on 192.168.0.1/24, with a dynamic range of 192.168.0.2
+    through 192.168.0.99, and a static range of 192.168.0.100 through
+    192.168.0.199, this will be migrated to::
+
+      IP range #1 (dynamic): 192.168.0.2 - 192.168.0.99
+      IP range #2 (reserved): 192.168.0.200 - 192.168.0.254
+
+    Since 192.168.0.100 - 192.168.0.199 (the previous static range)
+    is not accounted for, MAAS assumes it is free to allocate static
+    IP addresses from that range.
+
+  * Scalability is now possible by means of adding a second dynamic
+    IP range to a VLAN. (To deal with IP address exhaustion, MAAS
+    supports multiple dynamic ranges on one or more subnets within
+    a DHCP-enabled VLAN.)
+
+  * Reserved ranges can now be allocated to a particular MAAS user.
+
+  * A comment field has been added, so that users can indicate why
+    a particular range of IP addresses is reserved.
+
+  * IP ranges can be configured in the Web UI via the Subnet
+    details page, or using the ``subnets`` REST API endpoint.
+
+**API 2.0 and MAAS CLI Updates**
+  Version 1.0 of the MAAS REST API has been removed and replaced with the 2.0
+  version of the REST API. As such, new endpoints and commands have been
+  introduced:
+
+  * RackControllers - This endpoint/command has the following operations
+    in addition to the base operations provided by nodes:
+
+      * ``import-boot-images`` - Import the boot images on all rack
+        controllers
+      * ``describe-power-types`` - Query all of the rack controllers for
+        power information
+
+  * RackController - This endpoint/command has the following operations
+    in addition to the base operations provided by nodes
+
+    * ``import-boot-images`` - Import boot images on the given rack
+      controller
+    * ``refresh`` - refresh the hardware information for the given rack
+      controller
+
+  * Machines - This endpoint/command replaces many of the operations
+    previously found in the nodes endpoint/command. The machines
+    endpoint/command has the following operations in addition to the
+    base operations provided by nodes.
+
+    * ``power-parameters`` - Retrieve power parameters for multiple
+      machines
+    * ``list-allocated`` - Fetch machines that were allocated to the
+      user/oauth token.
+    * ``allocate`` - Allocate an available machine for deployment.
+    * ``accept`` - Accept declared machine into MAAS.
+    * ``accept-all`` - Accept all declared machines into MAAS.
+    * ``create`` - Create a new machine.
+    * ``add-chassis`` - Add special hardware types.
+    * ``release`` - Release multiple machines.
+
+  * Machine - This endpoint/command replaces many of the operations
+    previously found in the node endpoint/command. The machine
+    endpoint/command has the following operations in addition to the
+    base operations provided by node.
+
+    * ``power-parameters`` - Obtain power parameters for the given machine.
+    * ``deploy`` - Deploy an operating system to a given machine.
+    * ``abort`` - Abort the machines current operation.
+    * ``get-curtin-config`` - Return the rendered curtin configuration for
+      the machine.
+    * ``power-off`` - Power off the given machine.
+    * ``set-storage-layout`` - Change the storage layout of the given
+      machine.
+    * ``power-on`` - Turn on the given machine.
+    * ``release`` - Release a given machine.
+    * ``clear-default-gateways`` - Clear any set default gateways on the
+      machine.
+    * ``update`` - Change machine configuration.
+    * ``query-power-state`` - Query the power state of a machine.
+    * ``commission`` - Begin commissioning process for a machine
+
+  Other endpoints/commands have changed:
+
+  * All list commands/operations have been converted to read
+  * All new and add commands/operations have been converted to create
+  * Nodes - The nodes endpoint/command is now a base endpoint/command
+    for all other node types(devices, machines, and rack-controllers).
+    As such most operations have been moved to the machines
+    endpoint/command.The following operations remain as they can be
+    used on all node types.
+
+    * ``is-registered`` - Returns whether or not the given MAC address is
+      registered with this MAAS.
+    * ``set-zone`` - Assign multiple nodes to a physical zone at once.
+    * ``read`` - List nodes visible to the user, optionally filtered by
+      criteria.
+
+  * Node - The node endpoint/command is now a base endpoint/command for
+    all other node types(devices, machines, and rack-controllers). As
+    such most operations have been moved to the machine endpoint/command.
+    The following operations remain as they can be used on all node types.
+
+    * ``read`` - Read information about a specific node
+    * ``details`` - Obtain various system details.
+    * ``delete`` - Delete a specific node.
+
+  * With the migration of nodes to machines the following items previously
+    outputted with the list command have been changed or removed from the
+    machines read command:
+
+    * ``status - Will now show all status types
+    * ``substatus``, ``substatus_action``, ``substatus_message``,
+      ``substatus_name`` - Replaced by ``status``, ``status_action``,
+      ``status_message``, ``status_name``.
+    * ``boot_type - Removed, MAAS 2.0 only supports fastpath.
+    * ``pxe_mac`` - Replaced by ``boot_interface``.
+    * ``hostname`` - Now only displays the hostname (without the domain) of
+      the machine. ``fqdn`` and ``domain`` attributes can now be used instead.
+
+  * And other endpoints/commands have been deprecated:
+
+    * NodeGroups - Replacement operations are found in the
+      RackControllers, Machines, and BootResources endpoints/commands.
+    * NodeGroupInterfaces - replacement operations are found in the
+      RackController, IPRanges, Subnets, and VLANS endpoints/commands.
+
+**Extended Storage Support**
+  MAAS 2.0 Storage Model has been extended to support:
+
+  * XFS as a filesystem.
+  * Mount options.
+  * Swap partitions. (MAAS 1.9 only supported the creation of a swap
+    file in the filesystem.)
+  * ``tmps``/``ramfs`` support.
+
+  All of these options are currently available over the CLI.
+
+**DHCP Snippets**
+  MAAS 2.0 introduces the ability to define DHCP snippets. This
+  feature allows administrators to manage DHCP directly from MAAS, removing
+  the need to manually modify template files. The following types of DHCP
+  snippets can be defined:
+
+   * **Host snippets** - used for configuration for a particular node in MAAS.
+   * **Subnet snippets** - used for configuration for a specific subnet in MAAS.
+   * **Global snippets** - used for configuration that will affect DHCP (isc-dhcp)
+     as a whole.
+
+  For more information, see :ref:`DHCP Snippets <dhcpsnippets>`.
+
+Minor new features
+------------------
+
+**MAAS proxy is now managed**
+  Starting from MAAS 2.0, MAAS now manages the configuration for
+  ``maas-proxy``. This allows MAAS to lock down the proxy so that it only
+  allows traffic from networks MAAS knows about. For more information, see
+  :ref:`MAAS Proxy <proxy>`.
+
+**rsyslog during enlistment and commissioning**
+  MAAS 2.0 now enables ``rsyslog`` for the enlistment and commissioning
+  environment (when using Xenial as the commissioning image). This allows users
+  to see ``cloud-init``'s syslog information in ``/var/log/maas/rsyslog/``.
+
+**Ability to change a machine’s domain name from the UI**
+  MAAS 2.0 introduces the ability to change a machine’s DNS domain
+  via the Web UI. It was previously supported on the API only.
+
+**Networks listing page**
+  In the **Networks** tab, a new networks overview has been introduced, which
+  provides a high-level view of the MAAS networking mode. The network model
+  can be grouped by either fabrics or spaces.
+
+**Service Tracking**
+  MAAS now tracks the status of the services required for its operation, such
+  as ``bind``, ``maas-dhcpd``, ``maas-dhcpd6``, ``tgt``, and ``maas-proxy``.
+
+
+Other notable changes
+---------------------
+
+**MAAS 2.0 requires Python 3.5**
+  Starting with MAAS 2.0, MAAS has now been ported to Python 3.5 (the default
+  version of Python in Ubuntu 16.04 "Xenial").
+
+**MAAS 2.0 now fully supports native Django 1.8 migration system**
+  MAAS is now based on Django 1.8. Django 1.8 has dropped support for the
+  South migration system in favor of the native Django migration
+  system, which breaks backwards compatibility with previous versions of
+  Django.
+
+  MAAS continues to support a full upgrade path. MAAS versions 1.5, 1.7, 1.8,
+  and 1.9 have been tested and confirmed to upgrade seamlessly to MAAS 2.0.
+
+**Instant DHCP lease notifications**
+  MAAS no longer scans the leases file every 5 minutes. ``isc-dhcp-server``
+  now directly notifies MAAS if a lease is committed, released, or expires.
+
+**Host entries in DHCP**
+  Host entries are now rendered in the DHCP configuration instead
+  of placed in the leases file. This removes any state that previously
+  existed in the DHCP lease database on the cluster controller.
+
+  Starting with MAAS 2.0, if the dhcpd.leases file is lost (such as during a
+  failure scenario in a high availability environment), MAAS will be able to
+  reconstruct it.
+
+**Power control is no longer specific to a rack controller**
+  MAAS selects one of the available rack controllers to power control
+  or query a BMC. The same rack controller that powers the BMC does
+  not need to be the rack controller that the machine PXE boots from.
+
+
+2.0.0 (rc4)
+===========
+
+Issues fixed in this release
+----------------------------
+
+LP: #1592666    Mirror URL contains double slash (/) after hostname, impacting proxy cachaility.
+
+LP: #1604461    [2.0rc2] Static IP address are allowed to be created in a dynamic range.
+
+LP: #1610397    When juju adds containers to MAAS, ensure they inherit the parent machine domain name, if none is passed by Juju.
+
+LP: #1611342    UI error while generating a MAAS key (token).
+
+LP: #1610414    apiclient.maas_client.MAASClient.post() always sets an op in the query string
+
+
+2.0.0 (rc3)
+===========
+
+Issues fixed in this release
+----------------------------
+
+LP: #1557434    For the MAAS CLI, mimic the error behaviour provided by argparse 1.1 on PyPI when insufficient arguments are given.
+
+LP: #1594991    MAAS displays every power query on the summarized view of node event log.
+
+LP: #1603147    Commissioning dropdown is grey and checkmarks are missing.
+
+LP: #1576116    [2.0rc1] MAAS does not respect default subnet's DNS server when choosing default DNS
+
+LP: #1600720    [2.0rc1] MAAS doesn't honor DNS settings for a subnet for DHCP
+
+LP: #1598028    [2.0] Loading latest machine events can make web browser unresponsive
+
+LP: #1604128    [2.0rc2] Unable to add a public SSH Key due to lp1604147
+
+LP: #1604169    [2.0] maas login yields "ImportError: No module named 'maasserver'"
+
+LP: #1604962    Fixes to correctly log cloud-init/curtin FAIL events in the node event log.
+
+LP: #1604987    Fixes to correctly log "mark_failed" events.
+
+LP: #1602721    [2.0rc2] Can't get node-results via cli/api
+
+LP: #1604465    [2.0] RackController.get_image_sync_status causes huge load on regiond process
+
+LP: #1598149    [2.0rc2] MAAS is not automatically monitoring timeouts for commissioning.
+
+LP: #1605252    [2.0] Error messaging about monitor expiry has been dropped
+
+
+2.0.0 (rc2)
+===========
+
+Issues fixed in this release
+----------------------------
+
+LP: #1582070    Pick up wrong grub.cfg if another filesystem exists
+
+LP: #1599223    [2.0] confusing reverse DNS lookups because MAAS creates multiple PTR records
+
+LP: #1600259    [2.0] reverse DNS sometimes assigns FQDN where it should assign IFACE.FQDN
+
+LP: #1599997    [2.0rc1] after upgrade from 2.0b3, Error on request (13) subnet.list: 'NoneType' object is not iterable
+
+LP: #1598461    [2.0rc1] Image import dates are inconsistent
+
+LP: #1598937    [2.0rc1] Following fresh install maas command fails - PermissionError: [Errno 13] Permission denied: '/home/ubuntu/.maascli.db'
+
+LP: #1597787    [1.9.3,2.0] cannot create more than 4 partitions when disk is configured with mbr
+
+LP: #1600267    [1.9,2.0,UX] Can't add aliases when parent interface is set to 'DCHP'
+
+LP: #1600198    [1.9,2.0,UX] Creating a Bcache disk is not prevented when is not created in partition
+
+
+>>>>>>> MERGE-SOURCE
 2.0.0 (rc1)
 ===========
 
 Issues fixed in this release
 ----------------------------
 
+LP: #1576357    Determine a method for how to reconnect a deleted rack controller
+
+LP: #1592246    [2.0b7, regression] maas-rack register makes up a new hostname
+
+LP: #1595753    [beta8] HMC power driver regression -- Not able to connect via SSH.
+
+LP: #1592885    [2.0b7] Date and time format should be consistent accross logs
+
+LP: #1597324    [2.0b8] Unable to set default gateway interface
+
+LP: #1515188    [1.9] VMware power management fails when VMs are organized in nested subfolders
+
+LP: #1596046    [2.0] maas 2.0 pxeboot fails on PowerNV
+
+LP: #1600267    [1.9,2.0,UX] Can't add aliases when parent interface is set to 'DCHP'
+
+LP: #1598937    [2.0 rc1] Following fresh install maas command fails - PermissionError: [Errno 13] Permission denied: '/home/ubuntu/.maascli.db'
+
+2.0.0 (beta8)
+=============
+
+Issues fixed in this release
+----------------------------
+
 LP: #1590081    Allow ed25519 and ecdsa ssh keys
 
 LP: #1462078    [2.0b2, UI] Can't add a device and it does not show why
@@ -1344,6 +1865,7 @@
 
 .. _1553617:
   https://launchpad.net/bugs/1553617
+<<<<<<< TREE
 
 
 1.9.1
@@ -3978,3 +4500,5 @@
 #1185897  expose ability to re-commission node in api and cli
 
 #997092  Can't delete allocated node even if owned by self
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'docs/index.rst'
--- docs/index.rst	2016-08-15 09:54:43 +0000
+++ docs/index.rst	2016-10-26 23:39:26 +0000
@@ -6,6 +6,15 @@
 
 This is the documentation for the `MAAS project`_.
 
+This is API and developer documentation only. MAAS 2.0 user documentation is
+published on `http://maas.io_` and its source is found on `GitHub_`.
+
+.. _http://maas.io:
+  http://maas.io/docs/
+
+.. _GitHub:
+  https://github.com/CanonicalLtd/maas-docs
+
 Metal as a Service -- MAAS -- lets you treat physical servers like
 virtual machines in the cloud. Rather than having to manage each
 server individually, MAAS turns your bare metal into an elastic

=== modified file 'src/apiclient/tests/test_maas_client.py'
=== modified file 'src/maas/settings.py'
=== modified file 'src/maasserver/api/account.py'
--- src/maasserver/api/account.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/api/account.py	2016-10-26 23:39:26 +0000
@@ -5,12 +5,21 @@
 
 __all__ = [
     'AccountHandler',
+<<<<<<< TREE
 ]
 
 import http.client
 import json
 
 from django.http import HttpResponse
+=======
+    ]
+
+import http.client
+import json
+
+from django.http import HttpResponse
+>>>>>>> MERGE-SOURCE
 from maasserver.api.support import (
     operation,
     OperationsHandler,
@@ -55,16 +64,30 @@
 
         """
         profile = request.user.userprofile
+<<<<<<< TREE
         consumer_name = get_optional_param(request.data, 'name')
         consumer, token = profile.create_authorisation_token(consumer_name)
         auth_info = {
+=======
+        consumer, token = profile.create_authorisation_token()
+        auth_info = {
+>>>>>>> MERGE-SOURCE
             'token_key': token.key, 'token_secret': token.secret,
+<<<<<<< TREE
             'consumer_key': consumer.key, 'name': consumer.name
         }
         return HttpResponse(
             json.dumps(auth_info),
             content_type='application/json; charset=utf-8',
             status=int(http.client.OK))
+=======
+            'consumer_key': consumer.key,
+            }
+        return HttpResponse(
+            json.dumps(auth_info),
+            content_type='application/json; charset=utf-8',
+            status=int(http.client.OK))
+>>>>>>> MERGE-SOURCE
 
     @operation(idempotent=False)
     def delete_authorisation_token(self, request):

=== modified file 'src/maasserver/api/blockdevices.py'
=== modified file 'src/maasserver/api/boot_resources.py'
=== modified file 'src/maasserver/api/events.py'
=== modified file 'src/maasserver/api/interfaces.py'
--- src/maasserver/api/interfaces.py	2016-10-20 16:04:24 +0000
+++ src/maasserver/api/interfaces.py	2016-10-26 23:39:26 +0000
@@ -415,6 +415,7 @@
         :param parents: Parent interfaces that make this bond.
 
         Fields for VLAN interface:
+<<<<<<< TREE
 
         :param tags: Tags for the interface.
         :param vlan: Tagged VLAN the interface is connected to.
@@ -424,6 +425,9 @@
 
         :param name: Name of the interface.
         :param mac_address: MAC address of the interface.
+=======
+
+>>>>>>> MERGE-SOURCE
         :param tags: Tags for the interface.
         :param vlan: VLAN the interface is connected to.
         :param parent: Parent interface for this bridge interface.

=== modified file 'src/maasserver/api/ip_addresses.py'
=== modified file 'src/maasserver/api/machines.py'
=== modified file 'src/maasserver/api/tests/test_api.py'
=== modified file 'src/maasserver/api/tests/test_blockdevice.py'
=== modified file 'src/maasserver/api/tests/test_ipaddresses.py'
--- src/maasserver/api/tests/test_ipaddresses.py	2016-10-18 16:31:31 +0000
+++ src/maasserver/api/tests/test_ipaddresses.py	2016-10-26 23:39:26 +0000
@@ -25,6 +25,7 @@
 )
 from maasserver.testing.factory import factory
 from maasserver.utils.converters import json_load_bytes
+<<<<<<< TREE
 from maasserver.utils.orm import (
     reload_object,
     transactional,
@@ -375,6 +376,14 @@
     def setUp(self):
         register_view("maasserver_discovery")
         return super().setUp()
+=======
+from maasserver.utils.orm import reload_object
+from netaddr import IPAddress
+from testtools.matchers import Equals
+
+
+class TestIPAddressesAPI(APITestCase.ForUser):
+>>>>>>> MERGE-SOURCE
 
     def post_reservation_request(
             self, subnet=None, ip_address=None, network=None, mac=None,

=== modified file 'src/maasserver/api/tests/test_machine.py'
--- src/maasserver/api/tests/test_machine.py	2016-10-20 19:43:37 +0000
+++ src/maasserver/api/tests/test_machine.py	2016-10-26 23:39:26 +0000
@@ -1231,6 +1231,43 @@
         machine = reload_object(machine)
         self.assertEqual(old_zone, machine.zone)
 
+<<<<<<< TREE
+=======
+    def test_PUT_sets_disable_ipv4(self):
+        self.become_admin()
+        original_setting = factory.pick_bool()
+        machine = factory.make_Node(
+            owner=self.user,
+            architecture=make_usable_architecture(self),
+            power_type='manual',
+            disable_ipv4=original_setting)
+        new_setting = not original_setting
+
+        response = self.client.put(
+            self.get_machine_uri(machine), {'disable_ipv4': new_setting})
+        self.assertEqual(http.client.OK, response.status_code)
+
+        machine = reload_object(machine)
+        self.assertEqual(new_setting, machine.disable_ipv4)
+
+    def test_PUT_leaves_disable_ipv4_unchanged_by_default(self):
+        self.become_admin()
+        original_setting = factory.pick_bool()
+        machine = factory.make_Node(
+            owner=self.user,
+            architecture=make_usable_architecture(self),
+            power_type='manual',
+            disable_ipv4=original_setting)
+        self.assertEqual(original_setting, machine.disable_ipv4)
+
+        response = self.client.put(
+            self.get_machine_uri(machine), {'zone': factory.make_Zone()})
+        self.assertEqual(http.client.OK, response.status_code)
+
+        machine = reload_object(machine)
+        self.assertEqual(original_setting, machine.disable_ipv4)
+
+>>>>>>> MERGE-SOURCE
     def test_PUT_updates_swap_size(self):
         self.become_admin()
         machine = factory.make_Node(

=== modified file 'src/maasserver/api/tests/test_machines.py'
--- src/maasserver/api/tests/test_machines.py	2016-10-26 21:16:16 +0000
+++ src/maasserver/api/tests/test_machines.py	2016-10-26 23:39:26 +0000
@@ -204,6 +204,7 @@
             "Select a valid choice. %s is not one of the "
             "available choices." % power_type, validation_errors[0])
 
+<<<<<<< TREE
     def test_POST_new_handles_empty_str_power_parameters(self):
         # Regression test for LP:1636858
         response = self.client.post(
@@ -243,6 +244,25 @@
             power_address, machine.power_parameters['power_address'])
         self.assertEqual(power_id, machine.power_parameters['power_id'])
 
+=======
+    def test_POST_new_handles_empty_str_power_parameters(self):
+        # Regression test for LP:1636858
+        response = self.client.post(
+            reverse('machines_handler'),
+            {
+                'architecture': make_usable_architecture(self),
+                'mac_addresses': ['aa:bb:cc:dd:ee:ff'],
+                'power_type': '',
+                'power_parameters': '',
+            })
+        self.assertEqual(http.client.OK, response.status_code)
+        system_id = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))['system_id']
+        machine = Machine.objects.get(system_id=system_id)
+        self.assertEquals('', machine.power_type)
+        self.assertItemsEqual({}, machine.power_parameters)
+
+>>>>>>> MERGE-SOURCE
     def test_GET_lists_machines(self):
         # The api allows for fetching the list of Machines.
         machine1 = factory.make_Node()

=== modified file 'src/maasserver/api/tests/test_node.py'
=== modified file 'src/maasserver/api/utils.py'
=== modified file 'src/maasserver/bootresources.py'
--- src/maasserver/bootresources.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/bootresources.py	2016-10-26 23:39:26 +0000
@@ -733,6 +733,7 @@
             {'sha256': rfile.largefile.sha256})
         maaslog.debug("Finalizing boot image %s.", ident)
 
+<<<<<<< TREE
         # Ensure that the size of the largefile starts at zero.
         rfile.largefile.size = 0
         transactional(rfile.largefile.save)(update_fields=['size'])
@@ -745,10 +746,21 @@
             database per chunk. This makes the process be reported correctly.
             """
             with rfile.largefile.content.open('wb') as stream:
+=======
+        # Ensure that the size of the largefile starts at zero.
+        rfile.largefile.size = 0
+        rfile.largefile.save(update_fields=['size'])
+
+        # Write the contents into the database, while calculating the sha256
+        # hash for the read data.
+        with rfile.largefile.content.open('wb') as stream:
+            while True:
+>>>>>>> MERGE-SOURCE
                 buf = reader.read(self.read_size)
                 stream.seek(0, 2)
                 stream.write(buf)
                 cksummer.update(buf)
+<<<<<<< TREE
                 buf_len = len(buf)
                 rfile.largefile.size += buf_len
                 rfile.largefile.save(update_fields=['size'])
@@ -765,6 +777,13 @@
         # Don't check the checksum if finalization was cancelled.
         if self._cancel_finalize:
             return
+=======
+                buf_len = len(buf)
+                rfile.largefile.size += buf_len
+                rfile.largefile.save(update_fields=['size'])
+                if buf_len != self.read_size:
+                    break
+>>>>>>> MERGE-SOURCE
 
         if not cksummer.check():
             # Calculated sha256 hash from the data does not match, what
@@ -1091,6 +1110,7 @@
     def insert_item(self, data, src, target, pedigree, contentsource):
         """Overridable from `BasicMirrorWriter`."""
         item = sutil.products_exdata(src, pedigree)
+<<<<<<< TREE
         product_name = pedigree[0]
         version_name = pedigree[1]
         versions = src['products'][product_name]['versions']
@@ -1110,6 +1130,23 @@
             return
         else:
             self.store.insert(item, contentsource)
+=======
+        product_name = pedigree[0]
+        version_name = pedigree[1]
+        versions = src['products'][product_name]['versions']
+        items = versions[version_name]['items']
+        if (
+                item['ftype'] == BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE and
+                BOOT_RESOURCE_FILE_TYPE.SQUASHFS_IMAGE in items.keys()):
+            # If both a SquashFS and root-image.gz are available only insert
+            # the SquashFS image.
+            return
+        elif item['ftype'] not in dict(BOOT_RESOURCE_FILE_TYPE_CHOICES).keys():
+            # Skip filetypes that we don't know about.
+            return
+        else:
+            self.store.insert(item, contentsource)
+>>>>>>> MERGE-SOURCE
 
 
 def download_boot_resources(path, store, product_mapping,

=== modified file 'src/maasserver/dhcp.py'
--- src/maasserver/dhcp.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/dhcp.py	2016-10-26 23:39:26 +0000
@@ -372,6 +372,7 @@
 
 @typed
 def make_subnet_config(
+<<<<<<< TREE
         rack_controller, subnet, maas_dns_server,
         ntp_servers: Union[list, dict], default_domain,
         failover_peer=None, subnets_dhcp_snippets: list=None):
@@ -381,7 +382,13 @@
         include in DHCP responses, or a dict; if the latter, it ought to match
         the output from `get_ntp_server_addresses_for_rack`.
     """
+=======
+        rack_controller, subnet, maas_dns_server, ntp_server, default_domain,
+        failover_peer=None, subnets_dhcp_snippets=[]):
+    """Return DHCP subnet configuration dict for a rack interface."""
+>>>>>>> MERGE-SOURCE
     ip_network = subnet.get_ipnetwork()
+<<<<<<< TREE
     if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
         # Replace MAAS DNS with the servers defined on the subnet.
         dns_servers = [IPAddress(server) for server in subnet.dns_servers]
@@ -400,6 +407,15 @@
         else:
             ntp_servers = [ntp_server]
 
+=======
+    if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
+        # Replace MAAS DNS with the servers defined on the subnet.
+        dns_servers = ", ".join(subnet.dns_servers)
+    elif maas_dns_server is not None and len(maas_dns_server) > 0:
+        dns_servers = maas_dns_server
+    else:
+        dns_servers = ""
+>>>>>>> MERGE-SOURCE
     return {
         'subnet': str(ip_network.network),
         'subnet_mask': str(ip_network.netmask),
@@ -486,7 +502,11 @@
     for subnet in subnets:
         subnet_configs.append(
             make_subnet_config(
+<<<<<<< TREE
                 rack_controller, subnet, maas_dns_server, ntp_servers,
+=======
+                rack_controller, subnet, maas_dns_server, ntp_server,
+>>>>>>> MERGE-SOURCE
                 domain, peer_name, subnets_dhcp_snippets))
 
     # Generate the hosts for all subnets.
@@ -558,6 +578,7 @@
     for vlan, (subnets_v4, subnets_v6) in vlan_subnets.items():
         # IPv4
         if len(subnets_v4) > 0:
+<<<<<<< TREE
             try:
                 config = get_dhcp_configure_for(
                     4, rack_controller, vlan, subnets_v4, ntp_servers,
@@ -580,8 +601,33 @@
                 })
                 hosts_v4.extend(hosts)
                 interfaces_v4.add(interface)
+=======
+            try:
+                config = get_dhcp_configure_for(
+                    4, rack_controller, vlan, subnets_v4, ntp_server,
+                    default_domain, dhcp_snippets)
+            except DHCPConfigurationError as e:
+                # XXX bug #1602412: this silently breaks DHCPv4, but we cannot
+                # allow it to crash here since DHCPv6 might be able to run.
+                # This error may be irrelevant if there is an IPv4 network in
+                # the MAAS model which is not configured on the rack, and the
+                # user only wants to serve DHCPv6. But it is still something
+                # worth noting, so log it and continue.
+                log.err(e)
+            else:
+                failover_peer, subnets, hosts, interface = config
+                if failover_peer is not None:
+                    failover_peers_v4.append(failover_peer)
+                shared_networks_v4.append({
+                    "name": "vlan-%d" % vlan.id,
+                    "subnets": subnets,
+                })
+                hosts_v4.extend(hosts)
+                interfaces_v4.add(interface)
+>>>>>>> MERGE-SOURCE
         # IPv6
         if len(subnets_v6) > 0:
+<<<<<<< TREE
             try:
                 config = get_dhcp_configure_for(
                     6, rack_controller, vlan, subnets_v6,
@@ -605,6 +651,32 @@
                 hosts_v6.extend(hosts)
                 interfaces_v6.add(interface)
     return DHCPConfigurationForRack(
+=======
+            try:
+                config = get_dhcp_configure_for(
+                    6, rack_controller, vlan, subnets_v6,
+                    ntp_server, default_domain, dhcp_snippets)
+            except DHCPConfigurationError as e:
+                # XXX bug #1602412: this silently breaks DHCPv6, but we cannot
+                # allow it to crash here since DHCPv4 might be able to run.
+                # This error may be irrelevant if there is an IPv6 network in
+                # the MAAS model which is not configured on the rack, and the
+                # user only wants to serve DHCPv4. But it is still something
+                # worth noting, so log it and continue.
+                log.err(e)
+            else:
+                failover_peer, subnets, hosts, interface = config
+                if failover_peer is not None:
+                    failover_peers_v6.append(failover_peer)
+                shared_networks_v6.append({
+                    "name": "vlan-%d" % vlan.id,
+                    "subnets": subnets,
+                })
+                hosts_v6.extend(hosts)
+                interfaces_v6.add(interface)
+    return (
+        get_omapi_key(),
+>>>>>>> MERGE-SOURCE
         failover_peers_v4, shared_networks_v4, hosts_v4, interfaces_v4,
         failover_peers_v6, shared_networks_v6, hosts_v6, interfaces_v6,
         get_omapi_key(), global_dhcp_snippets)

=== modified file 'src/maasserver/dns/tests/test_zonegenerator.py'
=== modified file 'src/maasserver/dns/zonegenerator.py'
=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2016-09-08 17:26:54 +0000
+++ src/maasserver/enum.py	2016-10-26 23:39:26 +0000
@@ -341,9 +341,15 @@
     #: Root Image (gets converted to root-image root-tgz, on the rack)
     ROOT_IMAGE = 'root-image.gz'
 
+<<<<<<< TREE
     #: Root image in SquashFS form, does not need to be converted
     SQUASHFS_IMAGE = 'squashfs'
 
+=======
+    # Root image in SquashFS form, does not need to be converted
+    SQUASHFS_IMAGE = 'squashfs'
+
+>>>>>>> MERGE-SOURCE
     #: Boot Kernel (ISCSI kernel)
     BOOT_KERNEL = 'boot-kernel'
 

=== modified file 'src/maasserver/forms.py'
=== modified file 'src/maasserver/forms_interface_link.py'
=== modified file 'src/maasserver/forms_settings.py'
=== added file 'src/maasserver/migrations/builtin/maasserver/0066_allow_squashfs.py'
--- src/maasserver/migrations/builtin/maasserver/0066_allow_squashfs.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0066_allow_squashfs.py	2016-10-26 23:39:26 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import (
+    migrations,
+    models,
+)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0065_larger_osystem_and_distro_series'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bootresourcefile',
+            name='filetype',
+            field=models.CharField(choices=[('root-tgz', 'Root Image (tar.gz)'), ('root-dd', 'Root Compressed DD (dd -> tar.gz)'), ('root-image.gz', 'Compressed Root Image'), ('squashfs', 'SquashFS Root Image'), ('boot-kernel', 'Linux ISCSI Kernel'), ('boot-initrd', 'Initial ISCSI Ramdisk'), ('boot-dtb', 'ISCSI Device Tree Blob')], default='root-tgz', max_length=20, editable=False),
+        ),
+    ]

=== renamed file 'src/maasserver/migrations/builtin/maasserver/0066_allow_squashfs.py' => 'src/maasserver/migrations/builtin/maasserver/0066_allow_squashfs.py.moved'
=== modified file 'src/maasserver/models/bootresource.py'
=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-10-26 18:28:12 +0000
+++ src/maasserver/models/node.py	2016-10-26 23:39:26 +0000
@@ -123,8 +123,12 @@
     COMMISSIONING_LIKE_STATUSES,
     get_failed_status,
     is_failed_status,
+<<<<<<< TREE
     MONITORED_STATUSES,
     NODE_FAILURE_MONITORED_STATUS_TIMEOUTS,
+=======
+    NODE_FAILURE_MONITORED_STATUS_TIMEOUTS,
+>>>>>>> MERGE-SOURCE
     NODE_TRANSITIONS,
 )
 from maasserver.rpc import (
@@ -220,23 +224,57 @@
 
 # Return type from `get_effective_power_info`.
 PowerInfo = namedtuple("PowerInfo", (
-    "can_be_started",
-    "can_be_stopped",
-    "can_be_queried",
-    "power_type",
-    "power_parameters",
-))
-
-DefaultGateways = namedtuple("DefaultGateways", (
-    "ipv4",
-    "ipv6",
-))
-
-GatewayDefinition = namedtuple("GatewayDefinition", (
-    "interface_id",
-    "subnet_id",
-    "gateway_ip",
-))
+<<<<<<< TREE
+    "can_be_started",
+    "can_be_stopped",
+    "can_be_queried",
+    "power_type",
+    "power_parameters",
+))
+
+DefaultGateways = namedtuple("DefaultGateways", (
+    "ipv4",
+    "ipv6",
+))
+
+GatewayDefinition = namedtuple("GatewayDefinition", (
+    "interface_id",
+    "subnet_id",
+    "gateway_ip",
+))
+=======
+    "can_be_started",
+    "can_be_stopped",
+    "can_be_queried",
+    "power_type",
+    "power_parameters",
+))
+
+DefaultGateways = namedtuple("DefaultGateways", (
+    "ipv4",
+    "ipv6",
+))
+
+GatewayDefinition = namedtuple("GatewayDefinition", (
+    "interface_id",
+    "subnet_id",
+    "gateway_ip",
+))
+
+# The sequence from which the decimal form of node system IDs should be
+# pulled. At the time of writing this should match the definition in migration
+# 0021_create_node_system_id_sequence, and vice-versa.
+node_system_id = Sequence(
+    "maasserver_node_system_id_seq", cycle=False,
+    minvalue=(24 ** 5), maxvalue=((24 ** 6) - 1),
+    start=15600471, owner="maasserver_node.system_id",
+)
+
+
+def generate_node_system_ids():
+    """Return an iterable that yields short system IDs."""
+    return map(znums.from_int, node_system_id)
+>>>>>>> MERGE-SOURCE
 
 
 def generate_node_system_id():
@@ -1127,6 +1165,7 @@
         This is the maximum time the commissioning is allowed to take.
         """
         # Return a *very* conservative estimate for now.
+<<<<<<< TREE
         return timedelta(
             minutes=NODE_FAILURE_MONITORED_STATUS_TIMEOUTS[
                 NODE_STATUS.COMMISSIONING]).total_seconds()
@@ -1140,6 +1179,11 @@
         return timedelta(
             minutes=NODE_FAILURE_MONITORED_STATUS_TIMEOUTS[
                 NODE_STATUS.ENTERING_RESCUE_MODE]).total_seconds()
+=======
+        return timedelta(
+            minutes=NODE_FAILURE_MONITORED_STATUS_TIMEOUTS[
+                NODE_STATUS.COMMISSIONING]).total_seconds()
+>>>>>>> MERGE-SOURCE
 
     def get_releasing_time(self):
         """Return the releasing time of this node (in seconds).
@@ -2865,6 +2909,7 @@
         if not gateway_ipv6:
             gateway_ipv6 = self._get_gateway_tuple_by_family(
                 found_gateways, IPADDRESS_FAMILY.IPv6)
+<<<<<<< TREE
         return DefaultGateways._make((gateway_ipv4, gateway_ipv6))
 
     def get_default_dns_servers(self, ipv4=True, ipv6=True):
@@ -2907,6 +2952,49 @@
                 ipv4=(ipv4 and gateways.ipv4 is not None),
                 ipv6=(ipv6 and gateways.ipv6 is not None))
         return [maas_dns_server]
+=======
+        return DefaultGateways._make((gateway_ipv4, gateway_ipv6))
+
+    def get_default_dns_servers(self):
+        """Return the default DNS servers for this node."""
+        # Circular imports.
+        from maasserver.dns.zonegenerator import get_dns_server_address
+
+        gateways = self.get_default_gateways()
+
+        # Try first to use DNS servers from default gateway subnets.
+        if gateways.ipv4 is not None:
+            subnet = Subnet.objects.get(id=gateways.ipv4.subnet_id)
+            if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
+                # An IPv4 subnet is hosting the default gateway and has DNS
+                # servers defined. IPv4 DNS servers take first-priority.
+                return subnet.dns_servers
+        if gateways.ipv6 is not None:
+            subnet = Subnet.objects.get(id=gateways.ipv6.subnet_id)
+            if subnet.dns_servers is not None and len(subnet.dns_servers) > 0:
+                # An IPv6 subnet is hosting the default gateway and has DNS
+                # servers defined. IPv6 DNS servers take second-priority.
+                return subnet.dns_servers
+
+        # No default gateway subnet has specific DNS servers defined, so
+        # use MAAS for the default DNS server.
+        if gateways.ipv4 is None and gateways.ipv6 is None:
+            # If there are no default gateways, the default is the MAAS
+            # region IP address.
+            maas_dns_server = get_dns_server_address(
+                rack_controller=self.get_boot_rack_controller())
+        else:
+            # Choose an address consistent with the primary address-family
+            # in use, as indicated by the presence (or not) of a gateway.
+            # Note that this path is only taken if the MAAS URL is set to
+            # a hostname, and the hostname resolves to both an IPv4 and an
+            # IPv6 address.
+            maas_dns_server = get_dns_server_address(
+                rack_controller=self.get_boot_rack_controller(),
+                ipv4=(gateways.ipv4 is not None),
+                ipv6=(gateways.ipv6 is not None))
+        return [maas_dns_server]
+>>>>>>> MERGE-SOURCE
 
     def get_boot_purpose(self):
         """

=== modified file 'src/maasserver/models/staticipaddress.py'
--- src/maasserver/models/staticipaddress.py	2016-10-17 23:38:43 +0000
+++ src/maasserver/models/staticipaddress.py	2016-10-26 23:39:26 +0000
@@ -298,6 +298,11 @@
         # DISTINCT ON returns the first matching row for any given
         # hostname, using the query's ordering.  Here, we're trying to
         # return the IPs for the oldest Interface address.
+<<<<<<< TREE
+=======
+        #
+        # For nodes that have disable_ipv4 set, leave out any IPv4 address.
+>>>>>>> MERGE-SOURCE
         default_ttl = "%d" % Config.objects.get_config('default_dns_ttl')
         if raw_ttl:
             ttl_clause = """node.address_ttl"""
@@ -364,7 +369,15 @@
             query_parms = []
         sql_query += """
                 staticip.ip IS NOT NULL AND
+<<<<<<< TREE
                 host(staticip.ip) != ''
+=======
+                host(staticip.ip) != '' AND
+                (
+                    node.disable_ipv4 IS FALSE OR
+                    family(staticip.ip) <> 4
+                )
+>>>>>>> MERGE-SOURCE
             ORDER BY
                 node.hostname,
                 is_boot DESC,
@@ -400,6 +413,7 @@
                 END,
                 interface.id
             """
+<<<<<<< TREE
         iface_sql_query = """
             SELECT
                 CONCAT(node.hostname, '.', domain.name) AS fqdn,
@@ -448,6 +462,58 @@
                 assigned DESC, /* Return all assigned IPs for a node first. */
                 interface.id
             """
+=======
+        iface_sql_query = """
+            SELECT
+                CONCAT(node.hostname, '.', domain.name) AS fqdn,
+                node.system_id,
+                node.node_type,
+                """ + ttl_clause + """ AS ttl,
+                staticip.ip,
+                interface.name
+            FROM
+                maasserver_interface AS interface
+            JOIN maasserver_node AS node ON
+                node.id = interface.node_id
+            JOIN maasserver_domain as domain ON
+                domain.id = node.domain_id
+            JOIN maasserver_interface_ip_addresses AS link ON
+                link.interface_id = interface.id
+            JOIN maasserver_staticipaddress AS staticip ON
+                staticip.id = link.staticipaddress_id
+            """
+        if isinstance(domain_or_subnet, Domain):
+            # This logic is similar to the logic in sql_query above.
+            iface_sql_query += """
+            LEFT JOIN maasserver_domain as domain2 ON
+                /* Pick up another copy of domain looking for instances of
+                 * the name as the top of a domain.
+                 */
+                domain2.name = CONCAT(
+                    interface.name, '.', node.hostname, '.', domain.name)
+            WHERE
+                (domain2.name IS NOT NULL OR node.domain_id = %s) AND
+            """
+        else:
+            # For subnets, we need ALL the names, so that we can correctly
+            # identify which ones should have the FQDN.  dns/zonegenerator.py
+            # optimizes based on this, and only calls once with a subnet,
+            # expecting to get all the subnets back in one table.
+            iface_sql_query += """
+            WHERE
+            """
+        iface_sql_query += """
+                staticip.ip IS NOT NULL AND
+                host(staticip.ip) != '' AND
+                (
+                    node.disable_ipv4 IS FALSE OR
+                    family(staticip.ip) <> 4
+                )
+            ORDER BY
+                node.hostname,
+                interface.id
+            """
+>>>>>>> MERGE-SOURCE
         # We get user reserved et al mappings first, so that we can overwrite
         # TTL as we process the return from the SQL horror above.
         mapping = self._get_user_reserved_mappings(domain_or_subnet)
@@ -456,14 +522,19 @@
         iface_is_boot = defaultdict(bool, {
             hostname: True for hostname in mapping.keys()
         })
+<<<<<<< TREE
         assigned_ips = defaultdict(bool)
         cursor.execute(sql_query, query_parms)
+=======
+        cursor.execute(sql_query, query_parms)
+>>>>>>> MERGE-SOURCE
         # The records from the query provide, for each hostname (after
         # stripping domain), the boot and non-boot interface ip address in ipv4
         # and ipv6.  Our task: if there are boot interace IPs, they win.  If
         # there are none, then whatever we got wins.  The ORDER BY means that
         # we will see all of the boot interfaces before we see any non-boot
         # interface IPs.  See Bug#1584850
+<<<<<<< TREE
         for (fqdn, system_id, node_type, ttl,
                 ip, is_boot) in cursor.fetchall():
             mapping[fqdn].node_type = node_type
@@ -491,6 +562,29 @@
                     mapping[name].system_id = system_id
                     mapping[name].ttl = ttl
                     mapping[name].ips.add(ip)
+=======
+        for (fqdn, system_id, node_type, ttl,
+                ip, is_boot) in cursor.fetchall():
+            mapping[fqdn].node_type = node_type
+            mapping[fqdn].system_id = system_id
+            mapping[fqdn].ttl = ttl
+            if is_boot:
+                iface_is_boot[fqdn] = True
+            # If we have an IP on the right interface type, save it.
+            if is_boot == iface_is_boot[fqdn]:
+                mapping[fqdn].ips.add(ip)
+        # Next, get all the addresses, on all the interfaces, and add the ones
+        # that are not already present on the FQDN as $IFACE.$FQDN.
+        cursor.execute(iface_sql_query, (domain_or_subnet.id,))
+        for (fqdn, system_id, node_type, ttl,
+                ip, iface_name) in cursor.fetchall():
+            if ip not in mapping[fqdn].ips:
+                name = "%s.%s" % (iface_name, fqdn)
+                mapping[name].node_type = node_type
+                mapping[name].system_id = system_id
+                mapping[name].ttl = ttl
+                mapping[name].ips.add(ip)
+>>>>>>> MERGE-SOURCE
         return mapping
 
     def filter_by_ip_family(self, family):

=== modified file 'src/maasserver/models/subnet.py'
=== modified file 'src/maasserver/models/tests/test_largefile.py'
=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-10-26 18:28:12 +0000
+++ src/maasserver/models/tests/test_node.py	2016-10-26 23:39:26 +0000
@@ -364,6 +364,27 @@
                 racks_and_regions.add(factory.make_Node(node_type=node_type))
         self.assertItemsEqual(racks_and_regions, Controller.objects.all())
 
+<<<<<<< TREE
+=======
+    def test_get_running_controller(self):
+        rack = factory.make_RackController()
+        self.useFixture(MAASIDFixture(rack.system_id))
+        self.assertEquals(rack, Controller.objects.get_running_controller())
+
+    def test_get_running_controller_can_ignore_cache(self):
+        # Store invalid value in cache
+        self.useFixture(MAASIDFixture(factory.make_string()))
+        rack = factory.make_RackController()
+        # Write valid value to disk
+        maas_id_path = get_path('/var/lib/maas/maas_id')
+        os.unlink(maas_id_path)
+        with open(maas_id_path, 'w') as fd:
+            fd.write(rack.system_id)
+        self.assertEquals(
+            rack, Controller.objects.get_running_controller(read_cache=False))
+        self.assertEquals(rack.system_id, get_maas_id())
+
+>>>>>>> MERGE-SOURCE
 
 class TestRackControllerManager(MAASServerTestCase):
 
@@ -4726,6 +4747,7 @@
             ), node.get_default_gateways())
 
 
+<<<<<<< TREE
 class TestGetDefaultDNSServers(MAASServerTestCase):
     """Tests for `Node.get_default_dns_servers`."""
 
@@ -4901,6 +4923,161 @@
 
 
 class TestNode_Start(MAASTransactionServerTestCase):
+=======
+class TestGetDefaultDNSServers(MAASServerTestCase):
+    """Tests for `Node.get_default_dns_servers`."""
+
+    def make_Node_with_RackController(
+            self, ipv4=True, ipv6=True, ipv4_gateway=True, ipv6_gateway=True,
+            ipv4_subnet_dns=None, ipv6_subnet_dns=None):
+        ipv4_subnet_dns = [] if ipv4_subnet_dns is None else ipv4_subnet_dns
+        ipv6_subnet_dns = [] if ipv6_subnet_dns is None else ipv6_subnet_dns
+        rack_v4 = None
+        rack_v6 = None
+        fabric = factory.make_Fabric()
+        vlan = fabric.get_default_vlan()
+        if ipv4:
+            gateway_ip = None if ipv4_gateway else ""
+            v4_subnet = factory.make_Subnet(
+                version=4, vlan=vlan, dns_servers=ipv4_subnet_dns,
+                gateway_ip=gateway_ip)
+        if ipv6:
+            gateway_ip = None if ipv6_gateway else ""
+            v6_subnet = factory.make_Subnet(
+                version=6, vlan=vlan, dns_servers=ipv6_subnet_dns,
+                gateway_ip=gateway_ip)
+        rack = factory.make_RegionRackController()
+        vlan.primary_rack = rack
+        vlan.dhcp_on = True
+        vlan.save()
+        # In order to determine the correct IP address per-address-family,
+        # a name lookup is performed on the hostname part of the URL.
+        # We need to mock that so we can return whatever IP addresses it
+        # resolves to.
+        rack.url = "http://region:5240/MAAS/"
+        if ipv4:
+            rack_v4 = factory.pick_ip_in_Subnet(v4_subnet)
+        if ipv6:
+            rack_v6 = factory.pick_ip_in_Subnet(v6_subnet)
+
+        def get_address(hostname, ip_version=4):
+            """Mock function to return the IP address of the rack based on the
+            given address family.
+            """
+            if ip_version == 4:
+                return {IPAddress(rack_v4)} if rack_v4 else set()
+            elif ip_version == 6:
+                return {IPAddress(rack_v6)} if rack_v6 else set()
+
+        resolve_hostname = self.patch(
+            server_address_module, 'resolve_hostname')
+        resolve_hostname.side_effect = get_address
+        rack.interface_set.all().delete()
+        rackif = factory.make_Interface(vlan=vlan, node=rack)
+        if ipv4:
+            rackif.link_subnet(INTERFACE_LINK_TYPE.STATIC, v4_subnet, rack_v4)
+        if ipv6:
+            rackif.link_subnet(INTERFACE_LINK_TYPE.STATIC, v6_subnet, rack_v6)
+        rack.boot_interface = rackif
+        rack.save()
+        node = factory.make_Node(status=NODE_STATUS.READY, disable_ipv4=False)
+        nodeif = factory.make_Interface(vlan=vlan, node=node)
+        if ipv4:
+            nodeif.link_subnet(INTERFACE_LINK_TYPE.AUTO, v4_subnet)
+        if ipv6:
+            nodeif.link_subnet(INTERFACE_LINK_TYPE.AUTO, v6_subnet)
+        node.boot_interface = nodeif
+        node.save()
+        return rack_v4, rack_v6, node
+
+    def test__uses_rack_ipv4_if_ipv4_only_with_no_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=False, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_rack_ipv4_if_ipv4_only_with_no_gateway_v4_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=False, ipv6_gateway=False,
+            ipv4_subnet_dns=[ipv4_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_rack_ipv6_if_ipv6_only_with_no_gateway_v6_dns(self):
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=False,
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
+
+    def test__uses_rack_ipv4_if_dual_stack_with_no_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_rack_ipv4_if_dual_stack_with_ipv4_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=True, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_subnet_ipv4_if_dual_stack_with_ipv4_gateway_with_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=True, ipv6_gateway=False,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv4_subnet_dns]))
+
+    def test__uses_rack_ipv6_if_dual_stack_with_ipv6_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=True)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
+
+    def test__uses_subnet_ipv6_if_dual_stack_with_ipv6_gateway(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=False, ipv6=True, ipv6_gateway=True,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv6_subnet_dns]))
+
+    def test__uses_rack_ipv4_if_ipv4_with_ipv4_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=False, ipv6_gateway=False)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v4]))
+
+    def test__uses_subnet_ipv4_if_ipv4_stack_with_ipv4_gateway_and_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=True, ipv4_gateway=True, ipv6=False, ipv6_gateway=False,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv4_subnet_dns]))
+
+    def test__uses_rack_ipv6_if_ipv6_with_ipv6_gateway(self):
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=True)
+        self.assertThat(node.get_default_dns_servers(), Equals([rack_v6]))
+
+    def test__uses_subnet_ipv6_if_ipv6_with_ipv6_gateway_and_dns(self):
+        ipv4_subnet_dns = factory.make_ip_address(ipv6=False)
+        ipv6_subnet_dns = factory.make_ip_address(ipv6=True)
+        rack_v4, rack_v6, node = self.make_Node_with_RackController(
+            ipv4=False, ipv4_gateway=False, ipv6=True, ipv6_gateway=True,
+            ipv4_subnet_dns=[ipv4_subnet_dns],
+            ipv6_subnet_dns=[ipv6_subnet_dns])
+        self.assertThat(
+            node.get_default_dns_servers(), Equals([ipv6_subnet_dns]))
+
+
+class TestNode_Start(MAASServerTestCase):
+>>>>>>> MERGE-SOURCE
     """Tests for Node.start()."""
 
     def setUp(self):

=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
--- src/maasserver/models/tests/test_staticipaddress.py	2016-10-18 08:00:37 +0000
+++ src/maasserver/models/tests/test_staticipaddress.py	2016-10-26 23:39:26 +0000
@@ -363,6 +363,7 @@
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(domain)
         self.assertEqual(expected_mapping, mapping)
 
+<<<<<<< TREE
     def test_get_hostname_ip_mapping_returns_all_mappings_for_subnet(self):
         domain = Domain.objects.get_default_domain()
         expected_mapping = {}
@@ -384,14 +385,42 @@
         self.assertEqual(expected_mapping, mapping)
 
     def test_get_hostname_ip_mapping_returns_fqdn_and_other(self):
+=======
+    def test_get_hostname_ip_mapping_returns_all_mappings_for_subnet(self):
+        domain = Domain.objects.get_default_domain()
+        expected_mapping = {}
+        for _ in range(3):
+            node = factory.make_Node(interface=True, disable_ipv4=False)
+            boot_interface = node.get_boot_interface()
+            subnet = factory.make_Subnet()
+            staticip = factory.make_StaticIPAddress(
+                alloc_type=IPADDRESS_TYPE.STICKY,
+                ip=factory.pick_ip_in_Subnet(subnet),
+                subnet=subnet, interface=boot_interface)
+            full_hostname = "%s.%s" % (node.hostname, domain.name)
+            expected_mapping[full_hostname] = HostnameIPMapping(
+                node.system_id, 30, {staticip.ip}, node.node_type)
+        # See also LP#1600259.  It doesn't matter what subnet is passed in, you
+        # get all of them.
+        mapping = StaticIPAddress.objects.get_hostname_ip_mapping(
+            Subnet.objects.first())
+        self.assertEqual(expected_mapping, mapping)
+
+    def test_get_hostname_ip_mapping_returns_fqdn_and_other(self):
+>>>>>>> MERGE-SOURCE
         hostname = factory.make_name('hostname')
         domainname = factory.make_name('domain')
         factory.make_Domain(name=domainname)
         full_hostname = "%s.%s" % (hostname, domainname)
         subnet = factory.make_Subnet()
         node = factory.make_Node_with_Interface_on_Subnet(
+<<<<<<< TREE
             interface=True, hostname=full_hostname, interface_count=3,
             subnet=subnet)
+=======
+            interface=True, hostname=full_hostname, interface_count=3,
+            subnet=subnet, disable_ipv4=False)
+>>>>>>> MERGE-SOURCE
         boot_interface = node.get_boot_interface()
         staticip = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.STICKY,
@@ -516,9 +545,14 @@
             alloc_type=IPADDRESS_TYPE.STICKY,
             subnet=subnet, interface=boot_interface)
         newer_nic = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+<<<<<<< TREE
         newer_ip = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.STICKY, subnet=subnet,
             interface=newer_nic)
+=======
+        newer_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY, interface=newer_nic)
+>>>>>>> MERGE-SOURCE
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(
             node.domain)
         expected_mapping = {
@@ -535,11 +569,20 @@
             interface=True, hostname=factory.make_name('host'))
         boot_interface = node.get_boot_interface()
         staticip = factory.make_StaticIPAddress(
+<<<<<<< TREE
             alloc_type=IPADDRESS_TYPE.STICKY, subnet=subnet,
             interface=boot_interface)
         nic = node.get_boot_interface()  # equals boot_interface
         auto_ip = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.AUTO, subnet=subnet, interface=nic)
+=======
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet, interface=boot_interface)
+        nic = node.get_boot_interface()
+        auto_ip = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.AUTO, interface=nic)
+>>>>>>> MERGE-SOURCE
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(
             node.domain)
         expected_mapping = {
@@ -605,15 +648,24 @@
         staticip = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.AUTO, interface=iface,
             subnet=subnet)
-        factory.make_StaticIPAddress(
+        discovered = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.DISCOVERED, interface=iface,
             subnet=subnet)
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(
             node.domain)
+<<<<<<< TREE
         expected_mapping = {
             node.fqdn: HostnameIPMapping(
                 node.system_id, 30, {staticip.ip}, node.node_type)}
         self.assertEqual(expected_mapping, mapping)
+=======
+        expected_mapping = {
+            node.fqdn: HostnameIPMapping(
+                node.system_id, 30, {staticip.ip}, node.node_type),
+            "%s.%s" % (iface.name, node.fqdn): HostnameIPMapping(
+                node.system_id, 30, {discovered.ip}, node.node_type)}
+        self.assertEqual(expected_mapping, mapping)
+>>>>>>> MERGE-SOURCE
 
     def test_get_hostname_ip_mapping_prefers_bond_with_no_boot_interface(self):
         subnet = factory.make_Subnet(
@@ -831,7 +883,13 @@
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(domain)
         expected_mapping = {
             node.fqdn: HostnameIPMapping(
+<<<<<<< TREE
                 node.system_id, 30, {sip0.ip}, node.node_type)}
+=======
+                node.system_id, 30, {sip0.ip}, node.node_type),
+            "%s.%s" % (iface1.name, node.fqdn): HostnameIPMapping(
+                node.system_id, 30, {sip1.ip}, node.node_type)}
+>>>>>>> MERGE-SOURCE
         self.assertEqual(expected_mapping, mapping)
 
     def test_get_hostname_ip_mapping_returns_correct_bond_ip(self):
@@ -877,8 +935,15 @@
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(domain)
         expected_mapping = {
             node.fqdn: HostnameIPMapping(
-                node.system_id, 30, {bond_sip.ip}, node.node_type),
-            }
+<<<<<<< TREE
+                node.system_id, 30, {bond_sip.ip}, node.node_type),
+            }
+=======
+                node.system_id, 30, {bond_sip.ip}, node.node_type),
+            "%s.%s" % (iface1.name, node.fqdn): HostnameIPMapping(
+                node.system_id, 30, {sip1.ip}, node.node_type),
+            }
+>>>>>>> MERGE-SOURCE
         self.assertEqual(expected_mapping, mapping)
 
 

=== modified file 'src/maasserver/models/tests/test_subnet.py'
=== modified file 'src/maasserver/node_status.py'
--- src/maasserver/node_status.py	2016-10-03 22:13:11 +0000
+++ src/maasserver/node_status.py	2016-10-26 23:39:26 +0000
@@ -218,6 +218,22 @@
     NODE_STATUS.EXITING_RESCUE_MODE: 5,
 }
 
+# State transitions that are monitored for timeouts for when a node
+# fails:
+# Mapping between in-progress statuses and the corresponding failed
+# statuses.
+NODE_FAILURE_MONITORED_STATUS_TRANSITIONS = {
+    NODE_STATUS.COMMISSIONING: NODE_STATUS.FAILED_COMMISSIONING,
+    NODE_STATUS.DEPLOYING: NODE_STATUS.FAILED_DEPLOYMENT,
+    NODE_STATUS.RELEASING: NODE_STATUS.FAILED_RELEASING,
+}
+
+NODE_FAILURE_MONITORED_STATUS_TIMEOUTS = {
+    NODE_STATUS.COMMISSIONING: 20,
+    NODE_STATUS.DEPLOYING: 40,
+    NODE_STATUS.RELEASING: 5,
+}
+
 # Statuses that correspond to managed steps for which MAAS actively
 # monitors that the status changes after a fixed period of time.
 MONITORED_STATUSES = list(NODE_FAILURE_STATUS_TRANSITIONS.keys())

=== modified file 'src/maasserver/preseed.py'
=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2016-10-24 23:01:00 +0000
+++ src/maasserver/preseed_network.py	2016-10-26 23:39:26 +0000
@@ -6,10 +6,14 @@
 __all__ = [
     ]
 
+<<<<<<< TREE
 from collections import defaultdict
 from operator import attrgetter
 
 from maasserver.dns.zonegenerator import get_dns_search_paths
+=======
+from maasserver.dns.zonegenerator import get_dns_search_paths
+>>>>>>> MERGE-SOURCE
 from maasserver.enum import (
     INTERFACE_TYPE,
     IPADDRESS_FAMILY,
@@ -26,7 +30,11 @@
     def __init__(self, node):
         self.node = node
         self.gateways = node.get_default_gateways()
+<<<<<<< TREE
         self.routes = StaticRoute.objects.all()
+=======
+        self.dns_servers = node.get_default_dns_servers()
+>>>>>>> MERGE-SOURCE
         self.gateway_ipv4_set = False
         self.gateway_ipv6_set = False
         # The default value is False: expected keys are 4 and 6.
@@ -56,6 +64,7 @@
         # Order the network_config where dependencies come first.
         self._order_config_dependency()
 
+<<<<<<< TREE
         # If we have no IPv6 addresses present, make sure we claim IPv4, so
         # that we at least get some address.
         if not self.addr_family_present[6]:
@@ -66,10 +75,21 @@
             name
             for name in sorted(get_dns_search_paths())
             if name != self.node.domain.name]
+=======
+        search_list = [self.node.domain.name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != self.node.domain.name]
+>>>>>>> MERGE-SOURCE
         self.network_config.append({
             "type": "nameserver",
+<<<<<<< TREE
             "address": default_dns_servers,
             "search": search_list,
+=======
+            "address": self.dns_servers,
+            "search": search_list,
+>>>>>>> MERGE-SOURCE
         })
 
         network_config = {

=== modified file 'src/maasserver/preseed_storage.py'
=== modified file 'src/maasserver/rpc/nodes.py'
=== modified file 'src/maasserver/rpc/tests/test_nodes.py'
=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2016-10-26 23:39:26 +0000
@@ -77,6 +77,7 @@
     TwistedLoggerFixture,
 )
 import netaddr
+from provisioningserver.path import get_path
 from provisioningserver.rpc import (
     common,
     exceptions,
@@ -87,6 +88,10 @@
 from provisioningserver.rpc.testing import call_responder
 from provisioningserver.rpc.testing.doubles import DummyConnection
 from provisioningserver.utils import events
+from provisioningserver.utils.env import (
+    get_maas_id,
+    set_maas_id,
+)
 from provisioningserver.utils.testing import MAASIDFixture
 from provisioningserver.utils.twisted import (
     callInReactorWithTimeout,
@@ -1204,6 +1209,15 @@
             if len(exceptions) == 0:
                 return original()
             else:
+                # Stick a bad value in maas_id cache to test that maas_id is
+                # being reread from disk each time.
+                good_maas_id = get_maas_id()
+                set_maas_id(factory.make_string())
+                # Write the good value to disk
+                maas_id_path = get_path("/var/lib/maas/maas_id")
+                os.unlink(maas_id_path)
+                with open(maas_id_path, "w") as fd:
+                    fd.write(good_maas_id)
                 raise exceptions.pop(0)
 
         fake_promote = self.patch(regionservice.RegionAdvertising, "promote")

=== added file 'src/maasserver/static/css/maas-styles.css.OTHER'
--- src/maasserver/static/css/maas-styles.css.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/css/maas-styles.css.OTHER	2016-10-26 23:39:26 +0000
@@ -0,0 +1,1 @@
+.fake{display:none}body{font-size:14px}.one-col,.two-col,.three-col,.four-col,.five-col,.six-col,.seven-col,.eight-col,.nine-col,.ten-col,.eleven-col,.twelve-col,.col{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;clear:none;display:inline-block;float:none;margin-right:2.12766%;margin-bottom:20px;position:relative;width:100%}.twelve-col .one-col,.twelve-col .two-col,.twelve-col .three-col,.twelve-col .four-col,.twelve-col .five-col,.twelve-col .six-col,.twelve-col .seven-col,.twelve-col .eight-col,.twelve-col .nine-col,.twelve-col .ten-col,.twelve-col .eleven-col{width:100%}.last-col,.last{margin-right:0}.clearfix:after,.container:after{clear:both;content:"\0020";display:block;height:0;overflow:hidden;visibility:hidden}.clear{clear:both}.clearfix{display:block}@media only screen and (min-width: 768px){body{font-size:15px}.one-col,.two-col,.three-col,.four-col,.five-col,.six-col,.seven-col,.eight-col,.nine-col,.ten-col,.eleven-col,.twelve-col,.col{float:left}.one-col{width:6.38297%}.two-col{width:14.89361%}.three-col{width:23.40425%}.four-col{width:31.91489%}.five-col{width:40.42553%}.six-col{width:48.93617%}.seven-col{width:57.4468%}.eight-col{width:65.95744%}.nine-col{width:74.46808%}.ten-col{width:82.97872%}.eleven-col{width:91.48936%}.twelve-col{width:100%;margin-right:0}.twelve-col .one-col{width:6.3053%;margin-right:2.21238%}.twelve-col .two-col{width:14.823%;margin-right:2.21238%}.twelve-col .three-col{width:23.3407%;margin-right:2.21238%}.twelve-col .three-col{width:48.8938%;margin-right:2.21238%}.twelve-col .four-col{width:31.8584%;margin-right:2.21238%}.twelve-col .five-col{width:40.3761%;margin-right:2.21238%}.twelve-col .six-col{width:48.8938%;margin-right:2.21238%}.twelve-col .seven-col{width:57.4115%;margin-right:2.21238%}.twelve-col .eight-col{width:65.9292%;margin-right:2.21238%}.twelve-col .nine-col{width:74.4469%;margin-right:2.21238%}.twelve-col .ten-col{width:82.9646%;margin-right:2.21238%}.twelve-col .eleven-col{width:91.4823%;margin-right:2.21238%}.twelve-col .twelve-col{width:100%;margin-right:0}.eleven-col .one-col{width:6.89238%;margin-right:2.41837%}.eleven-col .two-col{width:16.20314%;margin-right:2.41837%}.eleven-col .three-col{width:25.5139%;margin-right:2.41837%}.eleven-col .four-col{width:34.82466%;margin-right:2.41837%}.eleven-col .five-col{width:44.13542%;margin-right:2.41837%}.eleven-col .six-col{width:53.44619%;margin-right:2.41837%}.eleven-col .seven-col{width:62.75695%;margin-right:2.41837%}.eleven-col .eight-col{width:72.06771%;margin-right:2.41837%}.eleven-col .nine-col{width:81.37847%;margin-right:2.41837%}.eleven-col .ten-col{width:90.68923%;margin-right:2.41837%}.eleven-col .eleven-col{width:100%;margin-right:0}.ten-col .one-col{width:7.6%;margin-right:2.66666%}.ten-col .two-col{width:17.86666%;margin-right:2.66666%}.ten-col .three-col{width:28.13333%;margin-right:2.66666%}.ten-col .four-col{width:38.4%;margin-right:2.66666%}.ten-col .five-col{width:48.66666%;margin-right:2.66666%}.ten-col .six-col{width:58.93333%;margin-right:2.66666%}.ten-col .seven-col{width:69.19999%;margin-right:2.66666%}.ten-col .eight-col{width:79.46666%;margin-right:2.66666%}.ten-col .nine-col{width:89.73333%;margin-right:2.66666%}.ten-col .ten-col{width:100%;margin-right:0}.nine-col .one-col{width:8.46953%;margin-right:2.97176%}.nine-col .two-col{width:19.91084%;margin-right:2.97176%}.nine-col .three-col{width:31.35215%;margin-right:2.97176%}.nine-col .four-col{width:42.79346%;margin-right:2.97176%}.nine-col .five-col{width:54.23476%;margin-right:2.97176%}.nine-col .six-col{width:65.67607%;margin-right:2.97176%}.nine-col .seven-col{width:77.11738%;margin-right:2.97176%}.nine-col .eight-col{width:88.55869%;margin-right:2.97176%}.nine-col .nine-col{width:100%;margin-right:0}.eight-col .one-col{width:9.56375%;margin-right:3.3557%}.eight-col .two-col{width:22.48322%;margin-right:3.3557%}.eight-col .three-col{width:35.40268%;margin-right:3.3557%}.eight-col .four-col{width:48.32214%;margin-right:3.3557%}.eight-col .five-col{width:61.24161%;margin-right:3.3557%}.eight-col .six-col{width:74.16107%;margin-right:3.3557%}.eight-col .seven-col{width:87.08053%;margin-right:3.3557%}.eight-col .eight-col{width:100%;margin-right:0}.seven-col .one-col{width:10.98265%;margin-right:3.85356%}.seven-col .two-col{width:25.81888%;margin-right:3.85356%}.seven-col .three-col{width:40.6551%;margin-right:3.85356%}.seven-col .four-col{width:55.49132%;margin-right:3.85356%}.seven-col .five-col{width:70.32755%;margin-right:3.85356%}.seven-col .six-col{width:85.16377%;margin-right:3.85356%}.seven-col .seven-col{width:100%;margin-right:0}.six-col .one-col{width:12.89592%;margin-right:4.52488%}.six-col .two-col{width:30.31674%;margin-right:4.52488%}.six-col .three-col{width:47.73755%;margin-right:4.52488%}.six-col .four-col{width:65.15837%;margin-right:4.52488%}.six-col .five-col{width:82.57918%;margin-right:4.52488%}.six-col .six-col{width:100%;margin-right:0}.five-col .one-col{width:15.61643%;margin-right:5.47945%}.five-col .two-col{width:36.71232%;margin-right:5.47945%}.five-col .three-col{width:57.80821%;margin-right:5.47945%}.five-col .four-col{width:78.9041%;margin-right:5.47945%}.five-col .five-col{width:100%;margin-right:0}.four-col .one-col{width:19.79166%;margin-right:6.94444%}.four-col .two-col{width:46.52777%;margin-right:6.94444%}.four-col .three-col{width:73.26388%;margin-right:6.94444%}.four-col .four-col{width:100%;margin-right:0}.three-col .one-col{width:27.01421%;margin-right:9.47867%}.three-col .two-col{width:63.5071%;margin-right:9.47867%}.three-col .three-col{width:100%;margin-right:0}.two-col .one-col{width:42.53731%;margin-right:14.92537%}.two-col .two-col{width:100%;margin-right:0}.one-col .one-col{width:100%;margin-right:0}.twelve-col .last-col{margin-right:0}.eleven-col .last-col{margin-right:0}.ten-col .last-col{margin-right:0}.nine-col .last-col{margin-right:0}.eight-col .last-col{margin-right:0}.seven-col .last-col{margin-right:0}.six-col .last-col{margin-right:0}.five-col .last-col{margin-right:0}.four-col .last-col{margin-right:0}.three-col .last-col{margin-right:0}.two-col .last-col{margin-right:0}.one-col .last-col{margin-right:0}.row,#context-footer{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin:0;padding:40px 40px 20px}.row:after{content:".";visibility:hidden;display:block;height:0;clear:both}.row-feature{background:none}.container{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:20px 20px 0;width:100%}.append-one{margin-right:8.51063%}.append-two{margin-right:17.02127%}.append-three{margin-right:25.53191%}.append-four{margin-right:34.04255%}.append-five{margin-right:42.55319%}.append-six{margin-right:51.06383%}.append-seven{margin-right:59.57446%}.append-eight{margin-right:68.0851%}.append-nine{margin-right:76.59574%}.append-ten{margin-right:85.10638%}.append-eleven{margin-right:93.61702%}.prepend-one{margin-left:8.51063%}.prepend-two{margin-left:17.02127%}.prepend-three{margin-left:25.53191%}.prepend-four{margin-left:34.04255%}.prepend-five{margin-left:42.55319%}.prepend-six{margin-left:51.06383%}.prepend-seven{margin-left:59.57446%}.prepend-eight{margin-left:68.0851%}.prepend-nine{margin-left:76.59574%}.prepend-ten{margin-left:85.10638%}.prepend-eleven{margin-left:93.61702%}.push-one{margin-left:57px}.pull-one,.pull-two,.pull-three,.pull-four,.pull-five,.pull-six,.pull-seven,.pull-eight,.pull-nine,.pull-ten,.pull-eleven{float:left;position:relative}.pull-one{margin-left:-6.38297%}.pull-two{margin-left:-17.02127%}.pull-three{margin-left:-25.53191%}.pull-four{margin-left:-34.04255%}.pull-five{margin-left:-34.04255%}.pull-six{margin-left:-51.06383%}.pull-seven{margin-left:-59.57446%}.pull-eight{margin-left:-68.0851%}.pull-nine{margin-left:-76.59574%}.pull-ten{margin-left:-85.10638%}.pull-eleven{margin-left:-93.61702%}.push-1,.push-two,.push-three,.push-four,.push-five,.push-six,.push-seven,.push-eight,.push-nine,.push-ten,.push-eleven{float:left;position:relative}.push-one{margin:0 -8.51063% 0 8.51063%}.push-two{margin:0 -19.14893% 0 19.14893%}.push-three{margin:0 -27.65957% 0 27.65957%}.push-four{margin:0 -36.17021% 0 36.17021%}.push-five{margin:0 -36.17021% 0 36.17021%}.push-six{margin:0 -53.19149% 0 53.19149%}.push-seven{margin:0 -61.70212% 0 61.70212%}.push-eight{margin:0 -70.21276% 0 70.21276%}.push-nine{margin:0 -78.7234% 0 78.7234%}.push-ten{margin:0 -87.23404% 0 87.23404%}.push-eleven{margin:0 -95.74468% 0 95.74468%}}@media only screen and (min-width: 984px){body{font-size:16px}.one-col,.two-col,.three-col,.four-col,.five-col,.six-col,.seven-col,.eight-col,.nine-col,.ten-col,.eleven-col,.twelve-col,.col{float:left}.one-col{width:6.38297%}.two-col{width:14.89361%}.three-col{width:23.40425%}.four-col{width:31.91489%}.five-col{width:40.42553%}.six-col{width:48.93617%}.seven-col{width:57.4468%}.eight-col{width:65.95744%}.nine-col{width:74.46808%}.ten-col{width:82.97872%}.eleven-col{width:91.48936%}.three-col:nth-child(1):nth-last-child(4),.three-col:nth-child(2):nth-last-child(3),.three-col:nth-child(3):nth-last-child(2),.three-col:nth-child(4):nth-last-child(1){width:23.36%}.three-col:nth-of-type(2){margin-right:2.21238%}.twelve-col{width:100%;margin-right:0}.twelve-col .one-col{width:6.3053%;margin-right:2.21238%}.twelve-col .two-col{width:14.823%;margin-right:2.21238%}.twelve-col .three-col{width:23.3407%;margin-right:2.21238%}.twelve-col .three-col:nth-child(1):nth-last-child(4),.twelve-col .three-col:nth-child(2):nth-last-child(3),.twelve-col .three-col:nth-child(3):nth-last-child(2),.twelve-col .three-col:nth-child(4):nth-last-child(1){width:23.3407%}.twelve-col .three-col:nth-of-type(2){margin-right:2.21238%}.twelve-col .four-col{width:31.8584%;margin-right:2.21238%}.twelve-col .five-col{width:40.3761%;margin-right:2.21238%}.twelve-col .six-col{width:48.8938%;margin-right:2.21238%}.twelve-col .seven-col{width:57.4115%;margin-right:2.21238%}.twelve-col .eight-col{width:65.9292%;margin-right:2.21238%}.twelve-col .nine-col{width:74.4469%;margin-right:2.21238%}.twelve-col .ten-col{width:82.9646%;margin-right:2.21238%}.twelve-col .eleven-col{width:91.4823%;margin-right:2.21238%}.twelve-col .twelve-col{width:100%;margin-right:0}.eleven-col .one-col{width:6.89238%;margin-right:2.41837%}.eleven-col .two-col{width:16.20314%;margin-right:2.41837%}.eleven-col .three-col{width:25.5139%;margin-right:2.41837%}.eleven-col .four-col{width:34.82466%;margin-right:2.41837%}.eleven-col .five-col{width:44.13542%;margin-right:2.41837%}.eleven-col .six-col{width:53.44619%;margin-right:2.41837%}.eleven-col .seven-col{width:62.75695%;margin-right:2.41837%}.eleven-col .eight-col{width:72.06771%;margin-right:2.41837%}.eleven-col .nine-col{width:81.37847%;margin-right:2.41837%}.eleven-col .ten-col{width:90.68923%;margin-right:2.41837%}.eleven-col .eleven-col{width:100%;margin-right:0}.ten-col .one-col{width:7.6%;margin-right:2.66666%}.ten-col .two-col{width:17.86666%;margin-right:2.66666%}.ten-col .three-col{width:28.13333%;margin-right:2.66666%}.ten-col .four-col{width:38.4%;margin-right:2.66666%}.ten-col .five-col{width:48.66666%;margin-right:2.66666%}.ten-col .six-col{width:58.93333%;margin-right:2.66666%}.ten-col .seven-col{width:69.19999%;margin-right:2.66666%}.ten-col .eight-col{width:79.46666%;margin-right:2.66666%}.ten-col .nine-col{width:89.73333%;margin-right:2.66666%}.ten-col .ten-col{width:100%;margin-right:0}.nine-col .one-col{width:8.46953%;margin-right:2.97176%}.nine-col .two-col{width:19.91084%;margin-right:2.97176%}.nine-col .three-col{width:31.35215%;margin-right:2.97176%}.nine-col .four-col{width:42.79346%;margin-right:2.97176%}.nine-col .five-col{width:54.23476%;margin-right:2.97176%}.nine-col .six-col{width:65.67607%;margin-right:2.97176%}.nine-col .seven-col{width:77.11738%;margin-right:2.97176%}.nine-col .eight-col{width:88.55869%;margin-right:2.97176%}.nine-col .nine-col{width:100%;margin-right:0}.eight-col .one-col{width:9.56375%;margin-right:3.3557%}.eight-col .two-col{width:22.48322%;margin-right:3.3557%}.eight-col .three-col{width:35.40268%;margin-right:3.3557%}.eight-col .four-col{width:48.32214%;margin-right:3.3557%}.eight-col .five-col{width:61.24161%;margin-right:3.3557%}.eight-col .six-col{width:74.16107%;margin-right:3.3557%}.eight-col .seven-col{width:87.08053%;margin-right:3.3557%}.eight-col .eight-col{width:100%;margin-right:0}.seven-col .one-col{width:10.98265%;margin-right:3.85356%}.seven-col .two-col{width:25.81888%;margin-right:3.85356%}.seven-col .three-col{width:40.6551%;margin-right:3.85356%}.seven-col .four-col{width:55.49132%;margin-right:3.85356%}.seven-col .five-col{width:70.32755%;margin-right:3.85356%}.seven-col .six-col{width:85.16377%;margin-right:3.85356%}.seven-col .seven-col{width:100%;margin-right:0}.six-col .one-col{width:12.89592%;margin-right:4.52488%}.six-col .two-col{width:30.31674%;margin-right:4.52488%}.six-col .three-col{width:47.73755%;margin-right:4.52488%}.six-col .four-col{width:65.15837%;margin-right:4.52488%}.six-col .five-col{width:82.57918%;margin-right:4.52488%}.six-col .six-col{width:100%;margin-right:0}.five-col .one-col{width:15.61643%;margin-right:5.47945%}.five-col .two-col{width:36.71232%;margin-right:5.47945%}.five-col .three-col{width:57.80821%;margin-right:5.47945%}.five-col .four-col{width:78.9041%;margin-right:5.47945%}.five-col .five-col{width:100%;margin-right:0}.four-col .one-col{width:19.79166%;margin-right:6.94444%}.four-col .two-col{width:46.52777%;margin-right:6.94444%}.four-col .three-col{width:73.26388%;margin-right:6.94444%}.four-col .four-col{width:100%;margin-right:0}.three-col .one-col{width:27.01421%;margin-right:9.47867%}.three-col .two-col{width:63.5071%;margin-right:9.47867%}.three-col .three-col{width:100%;margin-right:0}.two-col .one-col{width:42.53731%;margin-right:14.92537%}.two-col .two-col{width:100%;margin-right:0}.one-col .one-col{width:100%;margin-right:0}.twelve-col .last-col{margin-right:0}.eleven-col .last-col{margin-right:0}.ten-col .last-col{margin-right:0}.nine-col .last-col{margin-right:0}.eight-col .last-col{margin-right:0}.seven-col .last-col{margin-right:0}.six-col .last-col{margin-right:0}.five-col .last-col{margin-right:0}.four-col .last-col{margin-right:0}.three-col .last-col{margin-right:0}.two-col .last-col{margin-right:0}.one-col .last-col{margin-right:0}.row,#context-footer{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin:0;padding:40px 40px 20px}.row:after{content:".";visibility:hidden;display:block;height:0;clear:both}.row-feature{background:none}.container{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:20px 20px 0;width:100%}.append-one{margin-right:8.51063%}.append-two{margin-right:17.02127%}.append-three{margin-right:25.53191%}.append-four{margin-right:34.04255%}.append-five{margin-right:42.55319%}.append-six{margin-right:51.06383%}.append-seven{margin-right:59.57446%}.append-eight{margin-right:68.0851%}.append-nine{margin-right:76.59574%}.append-ten{margin-right:85.10638%}.append-eleven{margin-right:93.61702%}.prepend-one{margin-left:8.51063%}.prepend-two{margin-left:17.02127%}.prepend-three{margin-left:25.53191%}.prepend-four{margin-left:34.04255%}.prepend-five{margin-left:42.55319%}.prepend-six{margin-left:51.06383%}.prepend-seven{margin-left:59.57446%}.prepend-eight{margin-left:68.0851%}.prepend-nine{margin-left:76.59574%}.prepend-ten{margin-left:85.10638%}.prepend-eleven{margin-left:93.61702%}.push-one{margin-left:57px}.pull-one,.pull-two,.pull-three,.pull-four,.pull-five,.pull-six,.pull-seven,.pull-eight,.pull-nine,.pull-ten,.pull-eleven{float:left;position:relative}.pull-one{margin-left:-6.38297%}.pull-two{margin-left:-17.02127%}.pull-three{margin-left:-25.53191%}.pull-four{margin-left:-34.04255%}.pull-five{margin-left:-34.04255%}.pull-six{margin-left:-51.06383%}.pull-seven{margin-left:-59.57446%}.pull-eight{margin-left:-68.0851%}.pull-nine{margin-left:-76.59574%}.pull-ten{margin-left:-85.10638%}.pull-eleven{margin-left:-93.61702%}.push-1,.push-two,.push-three,.push-four,.push-five,.push-six,.push-seven,.push-eight,.push-nine,.push-ten,.push-eleven{float:left;position:relative}.push-one{margin:0 -8.51063% 0 8.51063%}.push-two{margin:0 -19.14893% 0 19.14893%}.push-three{margin:0 -27.65957% 0 27.65957%}.push-four{margin:0 -36.17021% 0 36.17021%}.push-five{margin:0 -36.17021% 0 36.17021%}.push-six{margin:0 -53.19149% 0 53.19149%}.push-seven{margin:0 -61.70212% 0 61.70212%}.push-eight{margin:0 -70.21276% 0 70.21276%}.push-nine{margin:0 -78.7234% 0 78.7234%}.push-ten{margin:0 -87.23404% 0 87.23404%}.push-eleven{margin:0 -95.74468% 0 95.74468%}}html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,ol,ul,li,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,menu,nav,output,ruby,section,summary,time,mark,audio,video{border:0;margin:0;padding:0;vertical-align:baseline}article,aside,details,figcaption,figure,footer,header,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:300;src:url("../fonts/ubuntu-l-webfont.eot");src:url("../fonts/ubuntu-l-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/ubuntu-l-webfont.woff") format("woff"),url("../fonts/ubuntu-l-webfont.ttf") format("truetype"),url("../fonts/ubuntu-l-webfont.svg#ubuntulight") format("svg")}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:400;src:local("Ubuntu");src:url("../fonts/ubuntu-r-webfont.eot");src:url("../fonts/ubuntu-r-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/ubuntu-r-webfont.woff") format("woff"),url("../fonts/ubuntu-r-webfont.ttf") format("truetype"),url("../fonts/ubuntu-r-webfont.svg#ubunturegular") format("svg")}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:500;src:url("../fonts/ubuntu-m-webfont.eot");src:local("Ubuntu Medium"),local("Ubuntu-Medium"),url("../fonts/ubuntu-m-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/ubuntu-m-webfont.woff") format("woff"),url("../fonts/ubuntu-m-webfont.ttf") format("truetype"),url("../fonts/ubuntu-m-webfont.svg#ubuntumedium") format("svg")}@font-face{font-family:'Ubuntu';font-style:normal;font-weight:700;src:url("../fonts/ubuntu-b-webfont.eot");src:local("Ubuntu Bold"),local("Ubuntu-Bold"),url("../fonts/ubuntu-b-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/ubuntu-b-webfont.woff") format("woff"),url("../fonts/ubuntu-b-webfont.ttf") format("truetype"),url("../fonts/ubuntu-b-webfont.svg#ubuntubold") format("svg")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:300;src:url("../fonts/ubuntu-li-webfont.eot");src:local("Ubuntu Light Italic"),local("Ubuntu-LightItalic"),url("../fonts/ubuntu-li-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/ubuntu-li-webfont.woff") format("woff"),url("../fonts/ubuntu-li-webfont.ttf") format("truetype"),url("../fonts/ubuntu-li-webfont.svg#ubuntulight_italic") format("svg")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:400;src:local("Ubuntu Italic"),local("Ubuntu-Italic"),url("https://themes.googleusercontent.com/static/fonts/ubuntu/v5/GZMdC02DTXXx8AdUvU2etw.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:500;src:url("../fonts/ubuntu-mi-webfont.eot");src:local("Ubuntu Medium Italic"),local("Ubuntu-MediumItalic"),url("../fonts/ubuntu-mi-webfont.eot?#iefix") format("embedded-opentype"),url("../fonts/ubuntu-mi-webfont.woff") format("woff"),url("../fonts/ubuntu-mi-webfont.ttf") format("truetype"),url("../fonts/ubuntu-mi-webfont.svg#ubuntumedium_italic") format("svg")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:700;src:local("Ubuntu Bold Italic"),local("Ubuntu-BoldItalic"),url("https://themes.googleusercontent.com/static/fonts/ubuntu/v5/pqisLQoeO9YTDCNnlQ9bfz8E0i7KZn-EPnyo3HZu7kw.woff") format("woff")}html{font-size:100%}body{color:#333;font-family:Ubuntu, Arial, "libra sans", sans-serif;font-weight:300}blockquote,q{quotes:none}blockquote{margin:28px 20px}blockquote:before,blockquote:after,q:before,q:after{content:"";content:none}legend{border:0;*margin-left:-7px}figure{margin:0}abbr,acronym{cursor:help}a:focus{outline:thin dotted}a:hover,a:active{outline:0}a:link,a:visited{color:#dd4814;text-decoration:none}a:hover,a:active,a:focus{text-decoration:underline}a.link-arrow:after{content:"\0000a0›"}nav ul li h2 a:after{content:"\0000a0›"}nav ul li a:after,.carousel ul li a:after,ul li p a:after{content:""}ol,ul{margin-left:20px;margin-bottom:20px}ol ol,ul ul,ol ul,ul ol{margin-bottom:0}nav ul,nav ol{list-style:none;list-style-image:none}svg:not(:root){overflow:hidden}img{border:0;height:auto;max-width:100%}img.left{margin-right:20px}img.right{margin-left:20px}.middle img{vertical-align:middle;margin-top:4em}h1,h2,h3,h4,h5,h6{font-weight:300;line-height:1.3}h1{font-size:1.625em;margin-bottom:.5em}h2{font-size:1.438em;margin-bottom:.5em}h3{font-size:1.219em;margin-bottom:.522em}h4{font-size:1.25em;font-weight:400;margin-bottom:.615em}h5{font-size:1em;font-weight:700;margin-bottom:1em}h6{font-size:.723em;font-weight:400;margin-bottom:1em;letter-spacing:.1em;text-transform:uppercase}p,li{font-size:1em;line-height:1.5;margin:0;margin-bottom:.75em;padding:0}h2 span,h1 span{display:block}p+h2,ul+h2,ol+h2,pre+h2{margin-top:0.5625em}header nav a:link{font-weight:normal}p+h3,ul+h3,ol+h3,pre+h3{margin-top:0.78261em}p+h4,ul+h4,ol+h4,pre+h4{margin-top:1.39286em}ol+h2,p+h2,pre+h2,ul+h2{margin-top:.563em}ol+h3,p+h3,pre+h3,ul+h3{margin-top:.783em}ol+h4,p+h4,pre+h4,ul+h4{margin-top:1.219em}li{margin-bottom:.4em}li:last-of-type{margin-bottom:0}ins{background:#fffbeb;text-decoration:none}small,.smaller{font-size:13px}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{vertical-align:text-top}sub{vertical-align:text-bottom}dfn{font-style:italic}mark{background:#ff0;color:#000}code,pre{font-family:"Ubuntu Mono", "Consolas", "Monaco", "Lucida Console", "Courier New", Courier, monospace}pre{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fdf6f2;padding:.6em 1em;white-space:pre-wrap;word-wrap:break-word}blockquote{margin:0}blockquote>p{font-size:0.92857em;font-weight:100;margin:0 0 .4em 0}blockquote small{font-size:.813em;line-height:1.4}button,input,select,textarea{font-family:Ubuntu,Arial,"libra sans",sans-serif;margin:0;vertical-align:baseline;*vertical-align:middle}select{font-size:1em;font-weight:300}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="search"]{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-moz-box-sizing:content-box;-webkit-appearance:none;-webkit-box-sizing:content-box;box-sizing:content-box;font-family:Ubuntu,Arial,"libra sans",sans-serif;font-weight:300;outline:none;padding:0.6956522em 0.869565em}input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}form fieldset{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-repeat:no-repeat;background-color:#EFEEEC;background-position:-15px -15px;border:0;margin-bottom:8px;padding:15px 20px}form fieldset h3{border-bottom:1px dotted #dfdcd9;margin-bottom:9px;padding-bottom:10px}form fieldset li:first-child{margin-top:0}form input[type="text"],form input[type="email"],form input[type="tel"],form textarea{-webkit-appearance:none;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;background:#fff;border:1px solid #D2D2D2;display:block;font-family:Ubuntu,Arial,"libra sans",sans-serif;font-size:1em;font-weight:300;padding:0.6956522em 0.869565em}form input:focus,form textarea:focus{border:1px solid #dd4814}form textarea[readonly='readonly']{color:#999}form input[type="checkbox"],form input[type="radio"]{margin:0;width:auto}form input[type="checkbox"]+label,form input[type="radio"]+label{display:inline;margin-left:5px;vertical-align:middle;width:auto}form input[type="submit"]{font-size:1.14286em;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background-color:#dd4814;background-image:-moz-linear-gradient(#f26120, #dd4814);background-image:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#f26120), to(#dd4814));background-image:-webkit-linear-gradient(#f26120, #dd4814);background-image:-o-linear-gradient(#f26120, #dd4814);-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;border:0;color:#fff;display:block;padding:10px 14px;text-shadow:none;width:auto;margin-bottom:0}form input[type="submit"]:hover{background:#dd4814}form label{cursor:pointer;display:block;margin-bottom:4px}form label span{color:#df382c}form ul{margin-left:0}form li{list-style:none outside none;margin-top:14px}form button[type="submit"]{border:0;display:inline-block;font-family:Ubuntu, Arial, "libra sans", sans-serif;text-decoration:none;font-weight:300}form input[type="reset"]{display:none}table{border-collapse:collapse;border-spacing:0;overflow-x:scroll;margin-bottom:20px;margin:0 0 2.85714em 0;width:100%}table th,table td{padding:15px 10px;background:#f0edea;border:1px dotted #888}table td{text-align:center;vertical-align:middle}table thead th{border-collapse:separate;border-spacing:0 10px;background:#fee3d2;color:#333333;font-weight:normal}table tbody th{text-align:left;font-weight:normal;font-weight:300}table th[scope="col"]{text-align:center}table thead th:first-of-type{text-align:left}@media only screen and (max-width: 768px){table{display:block}}@media only screen and (min-width: 984px){form fieldset{padding:15px 20px}img{max-width:none}}.audience-consumer{color:#333}.audience-consumer .row-box,.audience-consumer .main-content{color:#333}.audience-consumer .inner-wrapper{background:#fff}.audience-consumer .quote-right-top{padding:60px 60px 0 40px;background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat;height:287px;position:absolute;right:-40px;text-align:left;top:-90px;width:31.91489%}.audience-consumer .quote-right-top p{font-size:1.14286em;margin:0.769em;padding-bottom:0;color:#fff}.audience-consumer .quote-right-top p cite{font-size:0.85714em;color:#fff;padding:0}.audience-consumer .quote-right-top p a,.audience-consumer .quote-right p a{color:#fff}.audience-consumer .quote-right{font-size:1.28571em;color:#fff;padding:50px 100px 0 50px;text-indent:-6px;background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-bl-287x287.png") no-repeat;min-height:287px;position:absolute;right:-20px;text-align:left;top:-90px;width:21.2006% em}.audience-consumer .quote-right cite{font-style:normal;margin-left:6px}.audience-consumer .quote-right-alt{background:url(/sites/ubuntu/latest/u/img/patterns/quote-white-br-360x360.png) 0 -100px no-repeat;color:#dd4814;padding:50px 50px 0 50px}.audience-consumer .quote-right-right{background:url("/sites/ubuntu/latest/u/img/patterns/quote-orange-br-287x287.png") no-repeat}.audience-enterprise h1{margin:0 0 18px 0}.audience-enterprise td{background:#fff}.audience-enterprise th,.audience-enterprise td{padding:6px 10px;background:#fff}.audience-enterprise th[scope="col"]{background:#E2D4DC;color:#772953}.audience-enterprise tbody th[rowspan]{background:#F7F2F6}.audience-enterprise tfoot th[rowspan]{background:#dfdcd9}.audience-enterprise tfoot td,.audience-enterprise tfoot th{font-weight:normal;background:#dfdcd9}.audience-enterprise .inner-wrapper{background:#2c001e;color:#fff}.audience-enterprise .row-box{background:#fff;color:#333}.row-enterprise{background:#772953;color:#fff;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.row-enterprise .box,.row-enterprise div{background:#772953;color:#fff}.row-enterprise a{color:#fff}.enterprise-dot-pattern{background:url("/sites/ubuntu/latest/u/img/patterns/enterprise-dot-pattern.png")}.developer-dot-pattern{background:url("/sites/ubuntu/latest/u/img/patterns/developer-dot-pattern.png")}.wrapper,header.banner .nav-primary,nav div.footer-a div,.inline-lists ul,.legal{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:auto}.inner-wrapper{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;clear:both;display:block;float:left;width:100%;margin:0;padding-bottom:20px;position:relative;z-index:1}@media only screen and (min-width: 768px){.med-six-col .three-col{width:48%}.med-six-col .three-col:nth-of-type(2n){margin-right:0}}@media only screen and (min-width: 769px){.inner-wrapper{border-radius:4px;padding-bottom:20px}}@media only screen and (min-width: 984px){.wrapper{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;margin:0 auto;position:relative;text-align:left;width:984px}.inner-wrapper{-moz-box-shadow:0 0 3px #c9c9c9;-webkit-box-shadow:0 0 3px #c9c9c9;box-shadow:0 0 3px #c9c9c9;margin:10px 0 30px}.three-col,.med-six-col .three-col{width:23.30%}.three-col.last-col:nth-of-type(2n){margin-right:0}.med-six-col .three-col:nth-of-type(2n){margin-right:20px}.med-six-col .three-col.last-col{margin-right:0}}.left{float:left}.right{float:right}.caps{text-transform:uppercase}img{border:0 none;height:auto;max-width:100%}img.left{margin-right:0}img.touch-border{margin-bottom:-3px}.accessibility-aid,.off-left{position:absolute;left:-999em}a.external{-moz-background-size:0.7em 0.7em;-webkit-background-size:0.7em 0.7em;-o-background-size:0.7em 0.7em;background-size:0.7em 0.7em;padding-right:.9em;background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/external-link-orange.svg");background-position:right 1px;background-repeat:no-repeat}.opera-mini a.external,.no-svg a.external{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/external-link-orange.png")}.text-center,.align-center{text-align:center}.no-margin{margin:0}.no-margin-bottom{margin-bottom:0}.no-padding-bottom{padding-bottom:0}.pull-left-20{margin-left:-20px}.pull-right-20{margin-right:-20px}.pull-left-40{margin-left:-40px}.pull-right-40{margin-right:-41px}.no-border{border:0}.link-top{font-size:1em;clear:both;margin-bottom:40px;margin-top:-40px}.link-top a{background:#fff;margin-right:10px;margin-top:-17px;padding:5px;float:right}.pull-bottom-right{position:absolute;right:0;bottom:0;left:auto}.box .pull-bottom-right{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0}.pull-bottom-left{margin-left:-20px;margin-bottom:-21px}.pull-top-right{margin-left:-20px;margin-top:-21px}div.box-image-centered span img.priority-0,div.row-image-centered span img.priority-0,div.row.row-image-centered span img.priority-0,img.priority-0{position:absolute;left:-999em}.priority-0,.not-for-small{position:absolute;left:-999em}.video-container{position:relative;padding-bottom:56.25%;padding-top:30px;height:0;overflow:hidden}.video-container iframe{position:absolute;top:0;left:0;width:100%;height:100%}.video-container+h3,.video-container+.video-title{margin-top:20px}@media only screen and (max-width: 768px){.pull-right-40{margin-right:-30px}.pull-bottom-right,.pull-bottom-left{position:static}img.pull-bottom-left{margin-bottom:0;margin-left:0}}@media only screen and (min-width: 768px){div.box-image-centered span img.priority-0,div.row-image-centered span img.priority-0,div.row.row-image-centered span img.priority-0,img.priority-0{position:relative;left:auto}.priority-0,.not-for-small{position:relative;left:auto}.for-mobile,.for-small{position:absolute;left:-999em}.pull-right{float:right;margin-right:-30px}img.pull-left{margin-left:-30px}img.touch-border{float:left;margin-bottom:-30px}}@media only screen and (min-width: 769px){img.left{margin-right:20px}}@media only screen and (min-width: 984px){img.touch-border{float:left;margin-bottom:-40px}img.pull-left{margin-left:-40px}.pull-right{float:right;margin-right:-40px}.for-tablet,.for-medium{display:none}.no-border{border:0}}.caps-centered,.muted-heading{font-size:.875em;margin-bottom:20px;text-align:center;text-transform:uppercase}p.intro{font-size:1.14286em;line-height:1.4}.row div p:last-child,.row div ul:last-child{margin-bottom:0}.four-col p:last-child{margin-bottom:0}.note{color:#888;font-size:.813em}@media only screen and (min-width: 768px){p.intro{font-size:1.13333em}}@media only screen and (min-width: 984px){h1{font-size:2.8125em}h2{font-size:2em;margin-bottom:.375em}h3{font-size:1.438em;margin-bottom:.522em}h4{font-size:1em;margin-bottom:.75em}h5{font-size:1em}p,li,code,pre{font-size:16px;line-height:1.5;margin-bottom:.75em}p.intro{font-size:1.25em}}header.banner{border-top:0;min-width:100%;width:auto;background:#dd4814;display:block;position:relative;z-index:2}header.banner .nav-primary{border:0;margin:0 auto;overflow:hidden}header.banner .nav-primary ul{border-right:1px solid #ed6637;float:left;margin:0;position:relative}header.banner .nav-primary ul li{border-left:1px solid #c64012;float:left;list-style-image:none;margin:0;text-indent:0;vertical-align:bottom}header.banner .nav-primary ul li:last-child{border-right:1px solid #c64012}header.banner .nav-primary ul li a:link,header.banner .nav-primary ul li a:visited{font-size:14px;border-left:1px solid #ec5b29;color:#fff;display:block;margin-bottom:0;padding:14px 14px 13px;position:relative;text-align:center;text-decoration:none;-webkit-font-smoothing:subpixel-antialiased;-moz-font-smoothing:subpixel-antialiased;-o-font-smoothing:subpixel-antialiased;font-smoothing:subpixel-antialiased}header.banner .nav-primary ul a.active{background:#B83A10;border-left:1px solid #ec5b29}header.banner .nav-primary ul li a:hover{background:#e1662f;border-top:0;-moz-box-shadow:inset 0 2px 2px -2px #777;-webkit-box-shadow:inset 0 2px 2px -2px #777;box-shadow:inset 0 2px 2px -2px #777}#main-navigation-link{display:none}header.banner .nav-toggle{position:absolute;right:0;display:block;width:48px;height:48px;text-indent:-99999px;background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/navigation-menu-plain.svg);-moz-background-size:25px auto;-webkit-background-size:25px auto;-o-background-size:25px auto;background-size:25px auto;background-repeat:no-repeat;background-position:center center;cursor:pointer}header.banner .no-script{display:none}.opera-mini header.banner .nav-toggle,.no-svg header.banner .nav-toggle{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/navigation-menu-plain.png)}header.banner nav ul{background-color:#f0f0f0;display:none;float:left}header.banner .nav-primary.active{-moz-box-shadow:0 1px 2px 1px rgba(120,120,120,0.2);-webkit-box-shadow:0 1px 2px 1px rgba(120,120,120,0.2);box-shadow:0 1px 2px 1px rgba(120,120,120,0.2);padding:0;border-bottom:1px solid #d4d7d4}header nav ul.active{display:block}header.banner .nav-primary ul li,header.banner .nav-primary ul li a:link,header.banner .nav-primary ul li a:visited,header.banner .nav-primary ul li a:active{display:block;padding:0;margin:0;border:none}header.banner .nav-primary ul li a:hover{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;background-color:#d0d0d0}header.banner .nav-primary ul li a.active{background-color:#ddd}header.banner .nav-primary ul li{border-bottom:1px solid #F2F2F4;font-size:16px}header.banner .nav-primary ul li:last-child{border:0}header.banner nav.nav-primary ul li a:link,header.banner .nav-primary ul li a:visited,header.banner .nav-primary ul li a:hover,header.banner .nav-primary ul li a:active{padding:14px 14px 13px;text-align:left}header.banner nav.nav-primary ul.active li ul{display:none}#menu.active:after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-arrow.svg);background-repeat:no-repeat;background-position:50% 26px;content:"";display:block;height:23px;margin-left:0;padding-bottom:17px;position:relative;top:-3px;width:48px;z-index:999}html.no-svg #menu.active:after,.opera-mini #menu.active:after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-arrow.png)}.nav-secondary{border-bottom:1px solid #dfdcd9;margin-bottom:0}.nav-secondary ul{float:left;margin-bottom:10px;margin-left:2px}.nav-secondary ul li{float:left;margin-top:16px;font-size:14px;margin-right:15px}.nav-secondary ul li a:link,.nav-secondary ul li a:visited{color:#333;font-size:14px;float:left}.nav-secondary ul li a:hover,.nav-secondary ul li a:active{color:#dd4814;text-decoration:none}.nav-secondary ul li,.nav-secondary ul li.active a:link,.nav-secondary ul li.active a:visited{color:#dd4814;text-decoration:none}.nav-secondary ul.breadcrumb{margin-left:20px}.nav-secondary ul.breadcrumb li,.nav-secondary ul.breadcrumb li a:link,.nav-secondary ul.breadcrumb li a:visited{color:#888;margin-right:8px}.nav-secondary ul.breadcrumb li.active a:link,.nav-secondary ul.breadcrumb li.active a:visited{color:#dd4814}header.banner h2{font-size:1.78571em;display:block;left:4px;margin-bottom:0;position:relative;text-transform:lowercase;top:14px}header.banner h2 a:link,header.banner h2 a:visited,header.banner a{color:#fff;float:left;text-decoration:none}header.banner .logo{border-left:0;float:left;height:48px;overflow:hidden}header.banner .logo-ubuntu{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/ubuntu-logo.png") no-repeat scroll 0 10px transparent;font-size:18px;margin-bottom:0;position:relative;text-transform:lowercase;float:left;margin:0;display:inline-block;height:32px;min-width:128px;margin-right:-20px;margin-left:10px;padding:7px 14px 9px 0}header.banner .logo-ubuntu img{margin-right:8px;position:absolute;left:-999em}header.banner .logo-ubuntu span{float:left;font-size:23px;font-weight:300;padding-left:122px;padding-right:20px;position:relative;top:5px}header.banner .nav-primary.nav-left .logo-ubuntu{float:right}header.banner .nav-primary.nav-right .logo-ubuntu{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-white.svg");background-size:107px 25px;float:left}html.no-svg header.banner .nav-primary.nav-right .logo-ubuntu,.opera-mini header.banner .nav-primary.nav-right .logo-ubuntu{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-white.png")}@media only screen and (max-width: 295px){header.banner .nav-primary.nav-right .logo-ubuntu,header.banner .logo-ubuntu{-moz-background-size:20px 20px;-webkit-background-size:20px 20px;-o-background-size:20px 20px;background-size:20px 20px;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu_cof-white_orange-hex.svg") 0 50% no-repeat;min-width:0;width:38px}header.banner .logo-ubuntu span{padding-left:38px}}html.no-svg header.banner .logo-ubuntu,.opera-mini header.banner .logo-ubuntu{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu_cof-white_orange-hex.png")}@media only screen and (max-width: 768px){header.banner .nav-primary{-moz-box-shadow:0 1px 2px 1px rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 2px 1px rgba(0,0,0,0.2);box-shadow:0 1px 2px 1px rgba(0,0,0,0.2)}header.banner .nav-primary.active{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;padding:0}header nav ul.active{float:left}header nav ul.active li:last-child a:link,header nav ul.active li:last-child a:visited{border-bottom:0}header.banner .nav-primary ul{position:relative;width:100%}header.banner .nav-primary ul li.active a:link,header.banner .nav-primary ul li.active a:visited{color:#333;font-weight:700}header.banner .nav-primary ul li,header.banner .nav-primary ul li a:link,header.banner .nav-primary ul li a:visited,header.banner .nav-primary ul li a:active{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:transparent;border:none;display:block;font-weight:300;margin:0;padding:0;width:100%}header.banner .nav-primary ul li a:link,header.banner .nav-primary ul li a:visited,header.banner .nav-primary ul li a:hover,header.banner .nav-primary ul li a:active{background-color:#f0f0f0;border-bottom:1px solid #d4d7d4;color:#333333;font-size:1em}header.banner .nav-primary ul li:nth-last-child(-n+2) a:link,header.banner .nav-primary ul li:nth-last-child(-n+2) a:visited{border:0}header.banner .nav-primary ul li a:hover{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;background:#f8f8f8}header.banner .nav-primary ul li a.active{background-color:#ddd}header.banner nav.nav-primary ul li a:link,header.banner .nav-primary ul li a:visited,header.banner .nav-primary ul li a:hover,header.banner .nav-primary ul li a:active{padding:8px 10px;text-align:left}header.banner .nav-primary ul li{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:transparent;border-bottom:0;border-right:1px solid #d4d7d4;float:left;width:50%}.nav-secondary{background:#fff}.nav-secondary ul.second-level-nav{border-top:1px solid #d4d7d4;display:none;margin-bottom:0;margin-left:0;padding-bottom:10px;padding-top:10px;width:100%}.nav-secondary ul.second-level-nav li{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:50%;margin:0;float:left}.nav-secondary ul.second-level-nav li a,.nav-secondary ul.second-level-nav li a:link,.nav-secondary ul.second-level-nav li a:visited{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box;display:block;height:100%;padding:10px 10px 10px 20px;width:100%}.nav-secondary ul.second-level-nav li.active a,.nav-secondary ul.second-level-nav li.active a:link,.nav-secondary ul.second-level-nav li.active a:visited{color:#333;font-weight:700}.nav-secondary ul.third-level-nav{display:none;margin-bottom:0;width:100%;padding-bottom:20px}.nav-secondary ul.third-level-nav li{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:50%;margin:0;float:left;padding-left:30px}.nav-secondary ul.third-level-nav li a,.nav-secondary ul.third-level-nav li a:link,.nav-secondary ul.third-level-nav li a:visited{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:10px 10px 10px 0;display:block;width:100%;height:100%}.nav-secondary ul.third-level-nav li.active a,.nav-secondary ul.third-level-nav li.active a:link,.nav-secondary ul.third-level-nav li.active a:visited{color:#333;font-weight:700}.nav-secondary ul.third-level-nav li.single-link{width:100%}.nav-secondary ul.third-level-nav li:only-child{width:100%}.nav-secondary ul.breadcrumb{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;margin-left:0;margin-bottom:0}.nav-secondary ul.breadcrumb li:first-of-type{border-bottom:1px solid #d4d7d4;margin-bottom:-1px}.nav-secondary ul.breadcrumb li{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#fff;width:100%;display:block;height:40px;margin:0}.nav-secondary ul.breadcrumb li a,.nav-secondary ul.breadcrumb li a:link,.nav-secondary ul.breadcrumb li a:visited{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:16px;width:100%;color:#333333;display:block;margin-right:0;text-decoration:none;padding:8px 10px 0 10px}.nav-secondary ul.breadcrumb li.active{margin-top:12px}.nav-secondary ul.breadcrumb li.active a,.nav-secondary ul.breadcrumb li.active a:link,.nav-secondary ul.breadcrumb li.active a:visited{color:#333;font-weight:700}.nav-secondary ul.breadcrumb li:nth-of-type(2n){margin-top:12px}.nav-secondary ul.breadcrumb li .after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-down-arrow.svg);background-position:center center;background-repeat:no-repeat;background-size:18px;float:right;height:18px;margin-right:-5px;margin-top:-6px;padding:10px;position:relative;right:0;top:0;width:18px}.nav-secondary ul.breadcrumb li+li{display:none}.nav-secondary ul.breadcrumb li+li a:link,.nav-secondary ul.breadcrumb li+li a:active,.nav-secondary ul.breadcrumb li+li a:visited{padding-left:20px}.nav-secondary ul.breadcrumb li+li a.after{background-image:none}.nav-secondary.open ul.breadcrumb li a:after,.nav-secondary.open ul.breadcrumb li a:link:after,.nav-secondary.open ul.breadcrumb li a:visited:after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-up-arrow.svg)}.nav-secondary.open ul.breadcrumb li+li a.after{background-image:none}.nav-secondary.open ul.breadcrumb li .after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-up-arrow.svg);margin-top:-7px}.nav-secondary.open ul.second-level-nav,.nav-secondary.open ul.third-level-nav,.nav-secondary.open ul.breadcrumb li+li{display:block}.no-js .nav-secondary ul.second-level-nav{display:block}.no-js #main-navigation-link{position:absolute;right:10px;top:12px;width:20px;height:28px;z-index:999;text-indent:-999em;display:block}.no-js #main-navigation-link a{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/navigation-menu-plain.svg");background-position:center center;background-repeat:no-repeat;background-size:25px auto;display:block;width:28px;height:28px;position:absolute}html.no-svg .nav-secondary ul.breadcrumb li .after,.opera-mini .nav-secondary ul.breadcrumb li .after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-down-arrow.png)}html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:after,html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:link:after,html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:visited:after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:link:after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:visited:after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-up-arrow.png)}html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li .after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li .after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-up-arrow.png)}html.no-svg header.banner .nav-primary #google-appliance-search-form button[type="submit"],.opera-mini header.banner .nav-primary #google-appliance-search-form button[type="submit"]{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search-black.png")}html.no-svg .nav-secondary ul.breadcrumb li .after,.opera-mini .nav-secondary ul.breadcrumb li .after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-down-arrow.png)}html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:after,html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:link:after,html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:visited:after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:link:after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li a:visited:after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-up-arrow.png)}html.no-svg .nav-secondary ul.breadcrumb.open ul.breadcrumb li .after,.opera-mini .nav-secondary ul.breadcrumb.open ul.breadcrumb li .after{background-image:url(//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/nav-up-arrow.png)}html.no-svg header.banner .nav-primary #google-appliance-search-form button[type="submit"],.opera-mini header.banner .nav-primary #google-appliance-search-form button[type="submit"]{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search-black.png")}header.banner .nav-toggle{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/navigation-menu-plain.svg");background-position:center center;background-repeat:no-repeat;background-size:25px auto;cursor:pointer;display:block;height:48px;position:absolute;right:0;text-indent:-99999px;width:48px}html.no-svg header.banner .nav-toggle,.opera-mini header.banner .nav-toggle{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/navigation-menu-plain.png")}}@media only screen and (min-width: 768px){header.banner .nav-primary ul li{border-bottom:0}}@media only screen and (min-width: 769px){header.banner{-moz-box-shadow:0 2px 2px -2px #777777 inset, 2px 1px #FFFFFF;-webkit-box-shadow:0 2px 2px -2px #777777 inset, 2px 1px #FFFFFF;box-shadow:0 2px 2px -2px #777777 inset, 2px 1px #FFFFFF}header.banner nav.nav-primary{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;border-bottom:0}header.banner .nav-toggle{display:none}header.banner nav ul{background-color:transparent;display:block}header.banner .nav-primary ul li{border-left:1px solid #C64012}header.banner .nav-primary ul li a:active,header.banner .nav-primary ul li a:hover,header.banner .nav-primary ul li a:visited,header.banner nav.nav-primary ul li a:link{border-left:1px solid #EC5B29}header.banner .nav-primary ul li:last-child{border-right:1px solid #C64012;border-left:1px solid #C64012}header.banner .nav-primary ul li a.active{background-color:#B83A10}header.banner .nav-primary ul li a:hover{background-color:#E1662F}.nav-secondary ul:last-child li:last-child{padding-bottom:10px}.nav-secondary ul.breadcrumb li,.nav-secondary ul.second-level-nav li,.nav-secondary ul.third-level-nav li{margin-right:15px}.nav-secondary ul.breadcrumb{float:left}.nav-secondary ul.breadcrumb li{margin-bottom:10px}.nav-secondary ul{float:none;margin-bottom:0}.nav-secondary ul li{margin-bottom:5px}}@media only screen and (min-width: 984px){header.banner{margin-bottom:20px}header.banner nav.nav-primary ul{display:block}header.banner .nav-primary,#nav-global .nav-global-wrapper{width:984px}header.banner .nav-primary.nav-right .logo-ubuntu{margin-left:0}}header.banner .nav-primary ul{position:static}header.banner .nav-primary li ul{-moz-box-shadow:0 2px 2px -1px #777;-webkit-box-shadow:0 2px 2px -1px #777;box-shadow:0 2px 2px -1px #777;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;background:#f7f7f7;border:1px solid #d5d5d5;display:none;float:none;margin:0;padding:5px 0;position:absolute;top:51px;width:200px}header.banner .nav-primary li:hover ul:after{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/arrow-up-smaller.png") no-repeat;content:'';display:block;height:8px;left:20px;position:relative;top:-13px;width:200px;z-index:999}.no-generatedcontent header.banner .nav-primary li ul{-webkit-border-radius:0 0 10px 10px;-moz-border-radius:0 0 10px 10px;border-radius:0 0 10px 10px;top:48px}header.banner .nav-primary li ul .arrow-up{display:none}header.banner .nav-primary li ul li{border:0;float:none}header.banner .nav-primary li ul li a:link,header.banner .nav-primary li ul li a:visited{border:0;color:#333333;padding:0 0 11px 14px;text-align:left;width:170px}header.banner .nav-primary li ul li a:hover{background:none repeat scroll 0 0 transparent;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;color:#DD4814}header.banner .nav-primary li ul li.first a:link,header.banner .nav-primary li ul li.first a:visited,header.banner .nav-primary li ul li:first-of-type a:link{padding:10px 14px}header.banner .nav-primary li ul li.active a:link,header.banner .nav-primary li ul li.active a:visited{background:none repeat scroll 0 0 transparent !important}header.banner .nav-primary li ul .promo{border-top:1px solid #D5D5D5;float:left;margin-top:5px;padding:15px 0 0}header.banner .nav-primary li ul .promo a:link,header.banner .nav-primary li ul .promo a:visited{background:none repeat scroll 0 0 transparent;border-left:0 none;color:#333333;height:auto;padding:0;text-align:left}header.banner .nav-primary li ul .promo p{margin:0 10px}header.banner .nav-primary li ul .promo a:hover{box-shadow:none;color:#DD4814}header.banner .nav-primary li ul .promo img{margin-top:14px;margin-bottom:-6px;-webkit-border-radius:0 0 10px 10px;-moz-border-radius:0 0 10px 10px;border-radius:0 0 10px 10px;position:relative;top:1px}header.banner .nav-primary li ul .promo .category{color:#888;font-size:11px;margin:0 10px;text-transform:uppercase}header.banner .nav-primary li:hover ul{display:block}html.lt-ie8 header.banner .nav-primary li:hover ul{display:none}.header-search,#box-search{padding:7px 0 7px 14px;overflow:hidden}.header-search input[type="search"],.header-search input[type="text"],#box-search input[type="search"],#box-search input[type="text"]{-webkit-appearance:none;-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,0.2);box-shadow:inset 0 1px 4px rgba(0,0,0,0.2);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-transition:all 0.5s ease-out;-moz-transition:all 0.5s ease-out;-ms-transition:all 0.5s ease-out;-o-transition:all 0.5s ease-out;transition:all 0.5s ease-out;background-color:#be3d00;border:none;color:#fff;display:block;float:left;font-size:16px;height:2.1em;margin-bottom:0;padding:0.5em 2.5em 0.5em 0.5em;width:100%}.header-search ::-webkit-input-placeholder,#box-search ::-webkit-input-placeholder{color:white;opacity:0.4}.header-search ::-webkit-input-placeholder,#box-search ::-webkit-input-placeholder{color:white;opacity:0.4}.header-search ::-moz-placeholder,#box-search ::-moz-placeholder{color:white;opacity:0.4}.header-search :-ms-input-placeholder,#box-search :-ms-input-placeholder{color:white;opacity:0.4}.header-search input:-moz-placeholder,#box-search input:-moz-placeholder{color:white;opacity:0.4}.header-search ::placeholder,#box-search ::placeholder{color:white;opacity:0.4}.header-search input[type="search"]:focus,#box-search input[type="search"]:focus{background-color:#a63603}.header-search button[type=submit],#box-search button[type=submit]{padding:3px 2px;line-height:0;float:left;margin-left:-40px;display:block;background:none;overflow:visible}.header-search button[type=submit]:hover,#box-search button[type=submit]:hover{background:none}.header-search button[type=submit] img,#box-search button[type=submit] img{height:28px;width:28px}header.banner .search-toggle{-moz-background-size:20px 20px;-webkit-background-size:20px 20px;-o-background-size:20px 20px;background-size:20px 20px;background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search_icon_white_64.png");background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search.svg");background-position:center center;background-repeat:no-repeat;display:block;height:48px;outline:none;overflow:hidden;position:absolute;right:58px;text-indent:-999em;top:0;width:24px}.search-toggle:link,.search-toggle:active{outline:none}#box-search,.header-search{background:#f0f0f0;border:0;display:none;float:left;margin-bottom:0;position:relative;margin:0 0 -1px 0;padding:0;width:100%;z-index:3}#box-search.active,.header-search.active,.header-search.open{display:block}#box-search div,.header-search div{-moz-box-shadow:inset 0 -4px 4px -4px rgba(0,0,0,0.3),inset 0 5px 5px -5px rgba(0,0,0,0.3);-webkit-box-shadow:inset 0 -4px 4px -4px rgba(0,0,0,0.3),inset 0 5px 5px -5px rgba(0,0,0,0.3);box-shadow:inset 0 -4px 4px -4px rgba(0,0,0,0.3),inset 0 5px 5px -5px rgba(0,0,0,0.3);background:#f0f0f0;margin:10px;position:relative;z-index:1}#box-search form input[type="search"],.header-search form input[type="search"]{font-size:1.14286em;-webkit-border-radius:4px 4px 4px 4px;-moz-border-radius:4px 4px 4px 4px;border-radius:4px 4px 4px 4px;-moz-box-shadow:0 2px 2px rgba(0,0,0,0.3) inset,0 -1px 3px rgba(0,0,0,0.2) inset,0 2px 0 rgba(255,255,255,0.4);-webkit-box-shadow:0 2px 2px rgba(0,0,0,0.3) inset,0 -1px 3px rgba(0,0,0,0.2) inset,0 2px 0 rgba(255,255,255,0.4);box-shadow:0 2px 2px rgba(0,0,0,0.3) inset,0 -1px 3px rgba(0,0,0,0.2) inset,0 2px 0 rgba(255,255,255,0.4);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;border:0;color:#333;font-size:16px;height:auto;margin:0;float:left;padding:9px 10px;width:100%}.yes-js .header-inner #box-search,.yes-js .header-inner .header-search{display:none}.yes-js .header-inner #box-search form,.yes-js .header-inner .header-search form{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0;margin-right:0;overflow:hidden;padding:10px;top:0;z-index:999;position:relative;width:100%}@media only screen and (max-width: 768px){header.banner .search-toggle{right:48px}html.no-svg .search-toggle,.opera-mini .search-toggle{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search-white.png")}}@media only screen and (min-width: 768px){header.banner .search-toggle{display:none}}@media only screen and (min-width: 960px){#box-search,.header-search{background:none;overflow:hidden;padding:7px 0 7px 14px;border-right:0 none;float:right;margin-bottom:0;padding-bottom:5px;padding-right:0;padding-top:7px;max-width:220px}#box-search form input[type="text"],#box-search form input[type="search"],.header-search form input[type="text"],.header-search form input[type="search"]{-moz-box-shadow:0 2px 4px rgba(0,0,0,0.4) inset;-webkit-box-shadow:0 2px 4px rgba(0,0,0,0.4) inset;box-shadow:0 2px 4px rgba(0,0,0,0.4) inset;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-search.png") no-repeat scroll 5px center,none repeat scroll 0 0 #BE3D00;border:6px solid #DE6532;border-width:0 0 1px;color:#fff;font-size:0.813em;height:24px;margin-bottom:0;padding:4px 4px 4px 30px;transition:all 0.5s ease 0s;width:86px}}@media only screen and (max-width: 960px){header.banner nav.nav-primary .header-search{padding:0;position:relative;top:0;width:100%}header.banner nav.nav-primary .header-search input[type="search"]{border-radius:0;background:#f7f7f7;color:#333}header.banner nav.nav-primary .header-search button[type="submit"]{width:32px;height:38px;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search-black.svg") no-repeat scroll center center transparent;background-size:28px 28px}header.banner nav.nav-primary .header-search button[type="submit"] img{max-width:none;display:none}header.banner nav.nav-primary .header-search.open{display:block}header.banner .search-toggle{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/search-white.svg");background-position:center center;background-repeat:no-repeat;background-size:25px auto;cursor:pointer;right:0;display:block;height:48px;position:absolute;text-indent:-99999px;width:48px}html.no-svg header.banner .search-toggle,.opera-mini header.banner .search-toggle{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/img/search-white.png")}.opera-mini x:-o-prefocus,.opera-mini header.banner .search-toggle{-o-background-size:25px auto;background-size:25px auto}}@media only screen and (min-width: 984px){#box-search,.header-search{display:block;margin-right:0}#box-search form input[type="text"]:focus,.header-search form input[type="text"]:focus{width:160px}}@media only screen and (max-width: 768px){header.banner .search-toggle{right:48px}}body.ubuntu-search .nav-secondary,body.search-results .nav-secondary,body.search-no-results .nav-secondary{display:none}body.ubuntu-search section>h1,body.ubuntu-search section article h1,body.search-results section>h1,body.search-results section article h1,body.search-no-results section>h1,body.search-no-results section article h1{padding-bottom:10px;font-size:1.438em;margin-bottom:0}body.ubuntu-search section>h1,body.search-results section>h1,body.search-no-results section>h1{border-bottom:1px dotted #dfdcd9}body.ubuntu-search .main-search,body.search-results .main-search,body.search-no-results .main-search{padding:20px 0;margin:0 0 20px 0;background-color:transparent}body.ubuntu-search .main-search input[type="search"],body.search-results .main-search input[type="search"],body.search-no-results .main-search input[type="search"]{float:left;width:100%;font-size:2em;border:1px solid #999;-moz-box-sizing:border-box;box-sizing:border-box;padding:0.2em 65px 0.2em 0.2em}body.ubuntu-search .main-search button[type=submit],body.search-results .main-search button[type=submit],body.search-no-results .main-search button[type=submit]{padding:4px;line-height:0;float:left;margin-left:-53px;display:block;background:none;overflow:visible;width:auto;margin-top:-4px}body.ubuntu-search .main-search button[type=submit]:hover,body.search-results .main-search button[type=submit]:hover,body.search-no-results .main-search button[type=submit]:hover{background:none}body.ubuntu-search .main-search button[type=submit] img,body.search-results .main-search button[type=submit] img,body.search-no-results .main-search button[type=submit] img{height:45px;width:45px}body.ubuntu-search .search-result h1 .title-main,body.search-results .search-result h1 .title-main,body.search-no-results .search-result h1 .title-main{margin-right:20px}body.ubuntu-search .search-result h1 .result-url,body.search-results .search-result h1 .result-url,body.search-no-results .search-result h1 .result-url{color:#999;overflow:hidden;text-overflow:ellipsis;display:block;vertical-align:bottom;padding-bottom:2px}body.ubuntu-search .search-result h1 .result-url a,body.search-results .search-result h1 .result-url a,body.search-no-results .search-result h1 .result-url a{color:#999}body.ubuntu-search .search-result p,body.search-results .search-result p,body.search-no-results .search-result p{margin-bottom:0}body.ubuntu-search .num-results,body.search-results .num-results,body.search-no-results .num-results{display:inline-block;margin-left:20px}body.ubuntu-search .bottom-results-total,body.search-results .bottom-results-total,body.search-no-results .bottom-results-total{text-align:center;width:100%;overflow:visible;padding-top:20px;margin:0}body.ubuntu-search .bottom-nav,body.search-results .bottom-nav,body.search-no-results .bottom-nav{overflow:hidden;margin-top:-26px}body.ubuntu-search .bottom-nav ul,body.search-results .bottom-nav ul,body.search-no-results .bottom-nav ul{margin-bottom:0;margin-left:0;padding:0;overflow:hidden}body.ubuntu-search .bottom-nav li,body.search-results .bottom-nav li,body.search-no-results .bottom-nav li{float:left;margin-left:15px}body.ubuntu-search .bottom-nav li:first-child,body.search-results .bottom-nav li:first-child,body.search-no-results .bottom-nav li:first-child{margin-left:0}body.ubuntu-search .nav-back,body.search-results .nav-back,body.search-no-results .nav-back{float:left}body.ubuntu-search .nav-back li:before,body.search-results .nav-back li:before,body.search-no-results .nav-back li:before{content:"\2039";color:#dd4814;margin-right:5px}body.ubuntu-search .nav-back li.item-extreme:before,body.search-results .nav-back li.item-extreme:before,body.search-no-results .nav-back li.item-extreme:before{content:"\2039\2039"}body.ubuntu-search .nav-forward,body.search-results .nav-forward,body.search-no-results .nav-forward{float:right}body.ubuntu-search .nav-forward li:after,body.search-results .nav-forward li:after,body.search-no-results .nav-forward li:after{content:"\203A";color:#dd4814;margin-left:5px}body.ubuntu-search .nav-forward li.item-extreme:after,body.search-results .nav-forward li.item-extreme:after,body.search-no-results .nav-forward li.item-extreme:after{content:"\203A\203A"}body.ubuntu-search .error-notification,body.search-results .error-notification,body.search-no-results .error-notification{background-color:#fdffdc;color:#333;padding:20px;-moz-box-sizing:border-box;box-sizing:border-box;width:100%;margin-top:20px;display:block}body.ubuntu-search .result-line,body.search-results .result-line,body.search-no-results .result-line{color:#ada69e}body.ubuntu-search .results-top,body.search-results .results-top,body.search-no-results .results-top{border-bottom:1px dotted #dfdcd9;padding-bottom:0.5em}body.ubuntu-search .search-container,body.search-results .search-container,body.search-no-results .search-container{padding-bottom:0}@media only screen and (min-width: 768px){.ubuntu-search .main-search button[type=submit]{margin-left:-60px;margin-top:0}}body footer.global #nav-global li:first-of-type a{margin-left:0}footer.global{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-moz-box-shadow:inset 0 2px 2px -1px #d3d3d3;-webkit-box-shadow:inset 0 2px 2px -1px #d3d3d3;box-shadow:inset 0 2px 2px -1px #d3d3d3;background:none;border-top:0;clear:both;display:block;padding:30px 10px 20px;position:relative;width:100%}footer.global .legal{margin:0 auto;width:100%}footer.global .legal{background-image:none;position:relative;clear:both;min-height:40px}footer.global .legal p,footer.global .legal ul{padding-left:0}footer.global h2{font-size:0.75em;line-height:1.4;margin-bottom:0;padding-bottom:0.5em}footer.global h2,footer.global h2 a:link,footer.global h2 a:visited{color:#333;font-weight:normal}footer.global nav ul li h2 a:after{content:""}footer.global ul{margin:0}footer.global nav ul li.two-col{display:inline-block;min-height:10em;vertical-align:top}footer.global nav ul li li{font-size:0.85714em;font-size:0.75em;margin-bottom:0}footer.global ul li li a:link,footer.global ul li li a:visited{color:#333;margin-bottom:0}footer.global ul li li a:hover,footer.global ul li li a:active,footer.global h2 a:hover,footer.global h2 a:active{color:#dd4814}footer.global .inline li{display:inline}footer.global p,footer.global ul.inline li a{color:#333;font-size:12px;margin-bottom:0}footer.global ul.inline li a:hover{color:#dd4814}footer.global ul.inline li:after{color:#888;content:"\00b7";vertical-align:middle;margin:0 5px}footer.global ul.inline li:last-child{width:120px}footer.global ul.inline li:last-child:after{content:""}footer.global .inline li{float:none;margin-bottom:0}footer.global .top-link{-moz-box-shadow:0 -4px 4px -4px rgba(0,0,0,0.3) inset;-webkit-box-shadow:0 -4px 4px -4px rgba(0,0,0,0.3) inset;box-shadow:0 -4px 4px -4px rgba(0,0,0,0.3) inset;background:none repeat scroll 0 0 transparent;border:0 none;float:left;font-size:0.75em;letter-spacing:0.05em;margin:0 0 0 -10px;padding-right:20px;text-transform:uppercase;width:100%}footer.global .top-link a{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-upload-warmgrey.svg");background-position:10px center;background-repeat:no-repeat;background-size:14px 14px;border-bottom:0 none;color:#888888;display:block;float:none;font-weight:400;padding:12px 0 12px 28px}html.no-svg footer.global .top-link a,.opera-mini footer.global .top-link a{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-upload-warmgrey.png")}@media only screen and (max-width: 768px){footer.no-global .legal{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;box-shadow:0 2px 2px -1px #D3D3D3 inset;padding-top:10px;margin-left:-10px;padding-left:10px;padding-right:10px}#livechat-eye-catcher{display:block}}@media only screen and (min-width: 768px){footer.global .inline li{display:inline;float:left}}@media only screen and (min-width: 769px){footer.global .top-link{display:none}footer.global .footer-b h2 a i{font-style:normal;display:inline}}@media only screen and (min-width: 984px){footer.global .legal{width:984px}footer.global{padding:30px 0 20px}footer.global .legal{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-grey.png") 100% 0 no-repeat}footer.global .footer-a{display:block}}#context-footer{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:1em;border-bottom:0;clear:both;padding-bottom:1px;padding-top:0;position:relative;margin-bottom:0;margin-left:0;margin-right:0;width:100%}#context-footer hr{-moz-box-shadow:inset 0 2px 2px -2px #333;-webkit-box-shadow:inset 0 2px 2px -2px #333;box-shadow:inset 0 2px 2px -2px #333;background:#dd4814;height:14px;margin:0 0 10px;border:0;clear:both}#context-footer div.twelve-col{display:table;float:none;margin-bottom:7px}#context-footer div div{display:block;padding-left:0;margin-bottom:20px}#context-footer div div div{display:block;padding-left:0;margin-bottom:0}#context-footer div div.feature-one{padding-left:0}#context-footer div div.feature-four{margin-bottom:0;margin-right:0}#context-footer>div{padding-left:10px;padding-right:10px}#context-footer ul{margin-bottom:5px}#context-footer li.active{display:none}#context-footer h3{font-size:1.14286em;font-weight:normal}#context-footer .list a:after,#context-footer a.link-arrow:after,#context-footer nav ul li h2 a:after{content:' \203A'}@media only screen and (min-width: 768px){#context-footer{margin-bottom:12px;padding-left:30px;padding-right:30px}#context-footer div+div{width:31%}#context-footer div div.feature-four{padding-bottom:20px}#context-footer hr{margin:0 -30px 40px}#context-footer>div{padding-left:0;padding-right:0}}@media only screen and (min-width: 984px){#context-footer{padding:0 40px 10px}#context-footer div div{display:table-cell;float:none;padding-left:20px;margin-bottom:0}#context-footer hr{margin:0 -40px 40px}}a.link-cta-ubuntu,a.link-cta-canonical,a.link-cta-inverted,button.cta-ubuntu,button.cta-canonical,form button[type="submit"],form input[type="submit"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:1.14286em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;background:#dd4814;color:#fff;text-decoration:none;display:inline-block;margin:0;font-family:Ubuntu, Arial, 'libra sans', sans-serif;font-weight:300;-webkit-font-smoothing:subpixel-antialiased;-moz-font-smoothing:subpixel-antialiased;-o-font-smoothing:subpixel-antialiased;font-smoothing:subpixel-antialiased;padding:8px 14px;width:100%;text-align:center}a.cta-large,button.cta-large{font-size:1.28571em;padding:10px 20px}a.link-cta-canonical,button.cta-canonical,form button.cta-canonical[type="submit"],form input.cta-canonical[type="submit"]{background:#772953;color:#fff}a.link-cta-inverted,button.cta-inverted{background:#fff;color:#333}.row-enterprise a.link-cta-canonical,.row-enterprise button.link-cta-canonical{background:#fff;color:#772953}a.link-cta-ubuntu:hover,a.link-cta-ubuntu:hover,button.cta-ubuntu:hover,form button[type="submit"]:hover,form input[type="submit"]:hover{background:#c03f11;text-decoration:none}a.link-cta-canonical:hover,button.cta-canonical:hover{background:#5f2143;text-decoration:none}a.link-cta-inverted:hover,.row-enterprise a.link-cta-canonical:hover,button.cta-inverted:hover,.row-enterprise button.cta-canonical:hover{background:#fff;text-decoration:underline}a.cta-deactivated,a.cta-deactivated:hover,button.cta-deactivated,button.cta-deactivated:hover{background:#efefef;color:#fff;cursor:not-allowed}@media only screen and (min-width: 768px){a.link-cta-ubuntu,a.link-cta-canonical,a.link-cta-inverted,button.cta-ubuntu,button.cta-canonical,form button[type="submit"],form input[type="submit"]{width:auto}}@media only screen and (min-width: 984px){a.link-cta-ubuntu,a.link-cta-canonical,a.link-cta-inverted,button.cta-ubuntu,button.cta-canonical,form button[type="submit"],form input[type="submit"]{width:auto}}form input,form select,form textarea{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;width:100%}form .fieldset-submit ul{margin-bottom:0}form fieldset .mktError,form fieldset .errMsg,form fieldset .reqMark{color:#df382c}form fieldset .mktFormMsg{clear:both;display:block}.row{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border-bottom:1px dotted #888;clear:both;padding:20px 10px 0;position:relative}.row br{display:none}.row.no-padding-bottom{padding-bottom:0 !important}.row-grey{background:#f7f7f7}.no-border{border:0}#main-content .row-hero{margin-top:20px;padding-top:0}.row-background{color:#fff;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/backgrounds/image-background-wallpaper.jpg") no-repeat scroll 50% 50% #4b1827}.row-background a.alternate{color:#fff;text-decoration:underline}.row-background a.alternate:hover{color:rgba(255,255,255,0.6)}@media only screen and (min-width: 768px){.row-background{background-position:center 50%;background-size:100% auto}}.strip{width:100%;display:block}.strip-dark{background-color:#2c001e;background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/backgrounds/background-grid.png");background-repeat:repeat;color:#fff}.strip-dark .list-ubuntu li{border:0}.strip-dark .resource{color:#333;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none}.strip-dark .resource:before{border-right-color:#2c001e}#main-content .strip-dark .resource:before{border-bottom-width:29px;right:-2px;top:-1px}#main-content .strip-dark .resource:hover:before{border-bottom-width:34px}#main-content .strip-dark .resource h2{padding-right:20px}.row-aux{background-color:rgba(255,255,255,0.6);text-align:center}.row-aux h2,.row-aux p{text-align:left}.row-aux a p{color:#333;margin-bottom:30px}.row-step h2{position:relative;top:5px}.row-step .step{position:relative;top:-5px;height:32px;width:32px;border-radius:50%;border:3px solid #dd4814;color:#dd4814;line-height:32px;text-align:center;background-color:#fff;font-size:23px;font-weight:400}@media only screen and (min-width: 768px){.row{padding:30px}#main-content .row-hero{margin-top:40px}}@media only screen and (min-width: 769px){.row-step .step{height:42px;width:42px;line-height:42px}.row br{display:block}}@media only screen and (min-width: 984px){.row br{display:block}.row{padding:60px 40px 40px}.no-border{border:0}}.box,.box-grey{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;padding:1.333em 20px}.box{background:#fff;border:1px solid #dfdcd9}.box-grey{background:#f7f7f7;color:#333}.box-orange{background:#dd4814;color:#fff}.box-highlight{-moz-box-shadow:0 2px 2px 0 #c2c2c2;-webkit-box-shadow:0 2px 2px 0 #c2c2c2;box-shadow:0 2px 2px 0 #c2c2c2;border:1px solid #f7f7f7}.box-textured{-moz-box-shadow:0 2px 2px 0 #c2c2c2;-webkit-box-shadow:0 2px 2px 0 #c2c2c2;box-shadow:0 2px 2px 0 #c2c2c2;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg");border:0}.box-padded{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#efefef;border:0;margin-bottom:20px;padding:6px 5px}.box-padded h3{font-size:1.39286em;margin-left:5px;margin-top:5px}.box-padded li h3{font-size:1.39286em;margin:0}.box-padded div{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fff;overflow:hidden;padding:8px 8px 2px}.box-padded-feature{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/soft-centre-bkg.gif") repeat scroll 0 0 #a09f9f;border:0;margin-bottom:20px;padding:11px 5px 6px}.box-padded-feature h3{color:#fff;margin-left:5px;font-size:1.39286em}.box-padded-feature h4{font-size:1.14286em;font-weight:normal}.box-padded-feature>div{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fff;overflow:hidden;padding:20px 8px}.box-padded-feature div div{margin-bottom:0}.box-padded-feature .inline-icons{display:table;width:100%;margin:0;text-align:center}.box-padded-feature .inline-icons li{display:table-cell;text-align:left;float:none}.box-padded-feature .one-col{width:48px;float:left}.resource{cursor:pointer;padding-bottom:40px;position:relative;-moz-transition:background .2s ease-out;-webkit-transition:background .2s ease-out;transition:background .2s ease-out}.resource h2{padding-right:20px}.resource.five-col h2 a:link,.resource.five-col h2 a:visited,.resource.four-col h2 a:link,.resource.four-col h2 a:visited{font-size:inherit !important}.resource.four-col h2 a:link,.resource.four-col h2 a:visited{font-size:1.125em}.resource.twelve-col h2 a:link,.resource.twelve-col h2 a:visited{font-size:1.40625em}.resource:hover{background-color:#fafafa}.resource:after{-moz-box-shadow:0 -1px 2px 0 #ddd;-webkit-box-shadow:0 -1px 2px 0 #ddd;box-shadow:0 -1px 2px 0 #ddd;content:'';height:1px;position:absolute;right:-6px;top:14px;-ms-transform:rotate(45deg);-webkit-transform:rotate(45deg);transform:rotate(45deg);-moz-transition:all .2s ease-out;-webkit-transition:all .2s ease-out;transition:all .2s ease-out;width:41px;z-index:2}.resource:hover:after{right:-9px;top:18px;width:48px}.resource:before{content:'';position:absolute;-moz-transition:border-width .2s ease-out;-webkit-transition:border-width .2s ease-out;transition:border-width .2s ease-out;top:-2px;right:-3px;width:0;height:0;border-bottom:30px solid #fdfdfd;border-right:30px solid #fff;-webkit-box-shadow:-2px 2px 2px rgba(176,176,176,0.4);-moz-box-shadow:-2px 2px 2px rgba(176,176,176,0.4);box-shadow:-2px 2px 2px rgba(176,176,176,0.4);z-index:2;-webkit-border-radius:0 0 0 0;-moz-border-radius:0 0 0 0;border-radius:0 0 0 0}.resource:hover:before{border-bottom-width:35px;border-right-width:35px}.resource:last-of-type{margin-bottom:30px}.resource .content-cat{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-resource-hub-icon-document.png") left center no-repeat;color:#aea79f;font-size:14px;letter-spacing:1px;margin:0;padding-left:20px;padding:0;position:absolute;text-transform:uppercase}.resource .content-cat-webinar{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-resource-hub-webinar.png") left center no-repeat}.resource.box-image-centered div+span img{margin-top:40px}html.yui3-js-enabled .resource:hover a{text-decoration:underline}.row-grey .resource:before{border-right-color:#f7f7f7}@media only screen and (max-width: 768px){.box-padded-feature .inline-icons li{float:left;display:block}.box-padded-feature .one-col{width:48px;float:left}}.arrow-up,.arrow-down,.arrow-right,.arrow-left{height:11px;position:absolute;width:18px}.arrow-up{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/arrow-up.png") 0 0 no-repeat;left:20px;top:-11px}.arrow-down{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/arrow-down.png") 0 0 no-repeat;bottom:-11px;right:20px}.arrow-right{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/arrow-right.png") 0 0 no-repeat;height:18px;right:-11px;top:20px;width:11px}.arrow-left{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/arrow-left.png") 0 0 no-repeat;bottom:20px;height:18px;left:-11px;width:11px}div>.arrow-left{left:-10px}@media only screen and (min-width: 769px){html.yui3-js-enabled .arrow{visibility:visible}}.list,.list-ubuntu,.list-canonical{list-style:none;margin-left:0}.list li,.list-ubuntu li,.list-canonical li{border-bottom:1px dotted #888;margin-bottom:0;padding:10px 0}.list li:last-of-type,.list li.last-item,.list-ubuntu li:last-of-type,.list-ubuntu li.last-item,.list-canonical li:last-of-type,.list-canonical li.last-item{border:0;padding-bottom:0}.list article{border-bottom:1px dotted #888;margin-bottom:0;padding:10px 0}.list-spaced article,.list-spaced li{padding:30px 0}nav .list a{display:block}.list-ubuntu li,.list-canonical li{background-repeat:no-repeat;background-position:0 1em;padding-left:25px}.list-ubuntu li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-orange.svg")}.list-canonical li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-midaubergine.svg")}.list-warm li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-warmgrey.svg")}.list-dark li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-darkaubergine.svg")}.vertical-divider .list-canonical li,.vertical-divider .list-ubuntu li{padding-left:25px}html.no-svg .list-ubuntu li,.opera-mini .list-ubuntu li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-orange.png")}html.no-svg .list-canonical li,.opera-mini .list-canonical li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-midaubergine.png")}html.no-svg .list-warm li,.opera-mini .list-warm li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-warmgrey.png")}html.no-svg .list-dark li,.opera-mini .list-dark li{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/tick-darkaubergine.png")}.no-bullets{list-style:none;margin-left:0}.row .combined-list ul,.row .combined-list div{margin-bottom:0}.row .combined-list li.last-item{border-bottom:1px dotted #888;padding-bottom:10px}.row .combined-list div.last-col,.row .combined-list ul.last-col{margin-bottom:20px}.row .combined-list div.last-col li.last-item,.row .combined-list ul.last-col li.last-item{border-bottom:0;padding-bottom:0}.inline{margin-left:0}.inline li{display:inline;list-style:none;margin-left:0;float:left}@media only screen and (min-width: 768px){.row .combined-list ul,.row .combined-list div{margin-bottom:20px}.row .combined-list li.last-item{border-bottom:0;padding-bottom:0}}ul.inline-logos{float:left;margin-left:0;padding:0;text-align:center;width:100%}ul.inline-logos li{clear:none;display:inline-block;float:none;margin:10px 20px;padding:0}ul.inline-logos li.clear-row{clear:left}ul.inline-logos li.last-item{border:0}ul.inline-logos img{-webkit-transition:all 0.5s ease-out;-moz-transition:all 0.5s ease-out;-ms-transition:all 0.5s ease-out;-o-transition:all 0.5s ease-out;transition:all 0.5s ease-out;vertical-align:middle;max-width:115px;max-height:32px}.inline-icons{margin:0 0 20px}.inline-icons li{margin-right:20px;margin-bottom:20px;text-align:left;display:inline-block}.inline-icons li.last-item{margin-right:0}.inline-icons.no-margin-bottom li{margin-bottom:0}.inline-icons img{vertical-align:middle;max-width:115px;max-height:32px}@media only screen and (max-width: 768px){ul.inline-logos img{max-width:172px;max-height:48px}}@media only screen and (min-width: 769px){ul.inline-logos li{clear:none;display:inline-block;height:auto;margin:20px 0;line-height:60px;padding:0 40px}ul.inline-logos li img{float:none;vertical-align:middle;max-width:200px;max-height:45px}}@media only screen and (min-width: 984px){.inline-icons{text-align:left;margin-bottom:20px}}blockquote.pull-quote{text-indent:0}blockquote.pull-quote p{color:#333;padding-left:10px;padding-right:10px;font-size:1.77379em;text-indent:-.4em;margin-left:.4em;line-height:1.3}blockquote.pull-quote p span{font-weight:bold;color:#dd4814;line-height:0;position:relative;left:-5px}blockquote.pull-quote p span+span{left:5px}blockquote.pull-quote p cite{margin:10px 0 0;font-weight:300;display:block;font-size:.75em;text-indent:0}blockquote.pull-quote.js{padding-left:60px;display:table-cell}blockquote.quote-canonical,blockquote.quote-canonical-white{font-size:1.14286em;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/quote-white-360x360.png") no-repeat 20px -130px;color:#772953;float:right;font-size:1em;height:215px;margin-top:0;padding:20px 60px 0;position:relative;width:236px}blockquote.quote-canonical-white{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/quote-aubergine-345x345.png") no-repeat 0 0;color:#fff;padding:80px 60px 0;height:265px}blockquote.quote p:first-child{font-size:1.28571em;line-height:1.3;text-indent:-7px}blockquote.quote-right-bottom{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-quote-orange.svg");background-repeat:no-repeat;background-size:287px 286px;color:#fff;height:167px;padding:60px 40px;position:static;right:-40px;top:-90px;width:207px}blockquote.quote-right-bottom p{color:#fff}blockquote.quote-grey{font-size:2.57143em;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/quote-grey-br-211x211.png") no-repeat scroll 0 0 transparent;color:#fff;height:152px;line-height:40px;margin-left:20px;padding:60px 0 0;text-align:center;width:211px}blockquote.quote-bottom-left{background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/quote-orange-bl-287x287.png") no-repeat;color:#fff;height:167px;padding:55px 40px 70px 45px;width:225px}html.no-svg blockquote.quote-right-bottom,.opera-mini blockquote.quote-right-bottom{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/picto-pack/picto-quote-orange.png")}.row-quote{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.row-quote blockquote{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;margin:0;padding:0}.row-quote blockquote p{margin-bottom:.75em;line-height:1.3;color:#333;padding-left:10px;padding-right:10px;text-indent:0}.row-quote blockquote span{font-weight:bold;color:#dd4814;line-height:0;position:relative;left:-5px}.row-quote blockquote span+span{left:5px}.row-quote blockquote cite{color:#333;font-style:normal;margin-bottom:0;font-size:.75em;text-indent:-14px;text-indent:0}.row-quote .quote-twitter{background:#fcece7 url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/pictogram-twitter-115x139.png") 20px bottom no-repeat;padding:20px 20px 20px 23.40425%}.row-quote .quote-twitter-small{background:#fcece7 url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/pictograms/pictogram-twitter-54x63.png") 99% bottom no-repeat;padding:20px 20px 20px 80px}.row-quote .quote-twitter-small p{margin:0;padding:0}blockquote.quote-canonical,blockquote.quote-canonical-white{background:none;color:#333;width:auto;height:auto;padding:0 30px;margin-top:20px}@media only screen and (min-width: 768px){.row-quote blockquote{text-indent:-7px}.pull-quote{text-indent:-.4em}.row-quote blockquote p{font-size:1.77357em}blockquote.pull-quote p,.row-quote blockquote p{padding-left:0;padding-right:0;text-indent:-.7em}blockquote.pull-quote p span,.row-quote blockquote p span{font-size:1.391304348em}blockquote.pull-quote p cite,.row-quote blockquote p cite{margin-left:0;text-indent:0}blockquote.pull-quote p span,.row-quote blockquote p span{top:5px}}@media only screen and (min-width: 769px){.row-quote blockquote p{font-size:1.77357em;text-indent:-.4em}}@media only screen and (min-width: 984px){.row-quote blockquote{padding:0 80px 20px;text-indent:-10px}blockquote.pull-quote p span,.row-quote blockquote p span{top:10px}}html.js .tabbed-content .accordion-button{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;height:auto;padding-bottom:.6em;padding-right:20px}html.yui3-js-enabled .tabbed-menu{display:none;padding-bottom:20px;padding-top:20px}html.yui3-js-enabled .arrow{display:none;position:absolute;visibility:hidden}html.yui3-js-enabled .tabbed-content{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;padding:8px 8px 0;background:#f7f7f7;margin-bottom:8px}html.yui3-js-enabled .tabbed-content.hide{display:block;opacity:1 !important}html.yui3-js-enabled .tabbed-content .title{display:none}html.yui3-js-enabled .tabbed-content div{display:none}html.yui3-js-enabled .tabbed-content .accordion-button{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-arrow-down.svg") no-repeat scroll right 3px #f7f7f7;color:#333;display:block;font-size:16px;padding-bottom:.6em;padding-right:20px;width:100%}html.yui3-js-enabled .tabbed-content.open .accordion-button{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-arrow-up.svg");margin-bottom:10px}html.yui3-js-enabled .tabbed-content.open div{display:block}html.yui3-js-enabled html.yui3-js-enabled.opera-mini .tabbed-content .accordion-button,html.yui3-js-enabled html.yui3-js-enabled.no-svg .tabbed-content .accordion-button{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-arrow-right.png")}html.yui3-js-enabled html.yui3-js-enabled.opera-mini .tabbed-content.open .accordion-button,html.yui3-js-enabled html.yui3-js-enabled.no-svg .tabbed-content.open .accordion-button{background-image:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/icons/icon-arrow-up.png")}html.yui3-js-enabled html.yui3-js-enabled.opera-mini.tabbed-content .accordion-button{background-image:none;margin-bottom:10px}html.yui3-js-enabled html.yui3-js-enabled.opera-mini.tabbed-content div{display:block}@media only screen and (min-width: 768px){html.yui3-js-enabled .tabbed-menu{display:block}html.yui3-js-enabled .tabbed-content{margin-bottom:20px;padding:40px}html.yui3-js-enabled .tabbed-content.hide{display:none;opacity:0 !important}html.yui3-js-enabled .tabbed-content .title{display:block}html.yui3-js-enabled .tabbed-content div{display:block}html.yui3-js-enabled .tabbed-content .vertical-divider div{display:table-cell}html.yui3-js-enabled .tabbed-content .accordion-button{display:none}}html.yui3-js-enabled .accordion-button.active{background-color:transparent}@media only screen and (min-width: 768px){.tabbed-menu{-moz-box-shadow:0 -1px 10px #cfcfcf inset;-webkit-box-shadow:0 -1px 10px #cfcfcf inset;box-shadow:0 -1px 10px #cfcfcf inset;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;background:none repeat scroll 0 0 #f7f7f7;padding-bottom:20px;padding-top:20px;position:relative}.tabbed-menu ul{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:table;margin-bottom:0;padding:0;position:relative;table-layout:fixed;width:100%}.tabbed-menu li{text-align:center;display:table-cell}.tabbed-menu a{color:#666;display:block;outline:none}.tabbed-menu a .active{color:#772953;text-decoration:none}.tabbed-menu a:hover{text-decoration:none}.tabbed-menu .arrow{bottom:0;position:absolute}.tabbed-content{*zoom:1;padding:20px 40px 0}.tabbed-content:before,.tabbed-content:after{content:"";display:table}.tabbed-content:after{clear:both}.tabbed-content .row{padding-left:0;padding-right:0}.tabbed-content .main-content{padding-bottom:40px}html.yui3-js-enabled .tabbed-content.hide{display:none;opacity:0}.tabbed-content-bg{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#fff;margin-left:20px;margin-right:20px}.tabbed-content-bg .row-box{padding-left:0;padding-right:0}html.yui3-js-enabled .arrow{visibility:visible}}.row.vertical-divider{padding-bottom:40px}.vertical-divider div,.vertical-divider li{border-right:0;display:block;padding-left:0;padding-right:0}.vertical-divider-full{padding-bottom:0}.vertical-divider-full>div{padding-bottom:40px}.row.vertical-divider-full{padding-bottom:0}@media only screen and (max-width: 767px){.vertical-divider>div,.vertical-divider>li{border-bottom:1px dotted #888;padding-bottom:20px}.vertical-divider div:last-of-type,.vertical-divider li:last-of-type,.inline-icons li:last-of-type{border-bottom:0;padding-bottom:5px}.row.vertical-divider{padding-bottom:0}.equal-height div,.equal-height li{height:auto !important}}@media only screen and (min-width: 984px){.row.vertical-divider{padding-bottom:60px}.vertical-divider>div,.vertical-divider>li{border-right:1px dotted #888;display:table-cell;float:none;margin-right:0;padding-left:20px;padding-right:20px;vertical-align:top}.vertical-divider>div:last-child,.vertical-divider>li:last-child,.vertical-divider>div.last-col,.vertical-divider>li.last-col,.vertical-divider>div:last-of-type,.vertical-divider>li:last-of-type{border-right:0;padding-right:0}.vertical-divider>div:first-child,.vertical-divider>li:first-child,.vertical-divider>div.first-col,.vertical-divider>li.first-col,.vertical-divider>div:first-of-type,.vertical-divider>li:first-of-type{padding-left:0}}.slider{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#f7f7f7;padding-top:40px}.slider .slide-window{overflow:hidden;position:relative;height:450px;-moz-transition:left 1s;-webkit-transition:left 1s;-o-transition:left 1s;transition:left 1s}.slider .slide-container{position:absolute;width:2800 px;-moz-transition:left 1s;-webkit-transition:left 1s;-o-transition:left 1s;transition:left 1s;left:0}.slider .slider-dots ul{position:absolute;top:550px;left:220px;z-index:5}.slider .slider-dots li{background-position:0 -8px;background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/sprite-pager.png") no-repeat;float:left;height:7px;list-style-type:none;margin-right:.75em;text-indent:-9999em;width:7px}.slider .slider-dots li.active{background-position:0 0}.slider .slider-dots a{display:block;outline:0}.slider .slide{float:right;width:700px}.slider .slide h3{margin-top:65px;display:inline-block}.slider .slide p{width:350px}.slider .arrow-prev,.slider .arrow-next{font-size:5em;margin-top:150px;display:block;color:#888;outline:0}.slider .arrow-prev:hover,.slider .arrow-next:hover{text-decoration:none;color:#333}.slider .arrow-prev:active,.slider .arrow-next:active{padding-top:1px;text-decoration:none}.slider .arrow-prev:focus,.slider .arrow-next:focus{text-decoration:none}.yui3-tooltip-hidden{display:none}.yui3-tooltip-content{-moz-box-shadow:0 2px 8px rgba(0,0,0,0.2);-webkit-box-shadow:0 2px 8px rgba(0,0,0,0.2);box-shadow:0 2px 8px rgba(0,0,0,0.2);background:url("//assets.ubuntu.com/sites/ubuntu/latest/u/img/patterns/grey-textured-background.jpg") repeat scroll 0 0 transparent;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px;border:1px solid #e3e3e3;color:#333;margin-top:-30px;max-width:520px;position:relative}.yui3-tooltip .yui3-widget-bd{padding:20px;width:320px}.yui3-tooltip .yui3-widget-bd *{max-width:100%}.yui3-tooltip .yui3-widget-bd h5{margin-bottom:10px;font-size:22px;font-weight:300}.yui3-tooltip .yui3-widget-bd img{float:left;margin-right:10px}.yui3-tooltip .yui3-widget-bd q{border-bottom:1px dotted #888;border-top:1px dotted #888;display:block;font-size:16px;font-style:italic;margin-bottom:0;margin-top:20px;padding:10px 0}.yui3-tooltip .yui3-widget-bd p:last-child{margin-bottom:0}.yui3-tooltip .yui3-widget-ft,.yui3-tooltip .yui3-widget-ft div{position:absolute;width:0;height:0;border-style:solid;line-height:0;font-size:0}.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft,.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div{top:-10px;left:50%;margin:0 0 0 -10px;border-width:0 10px 10px;border-color:#efefef transparent}.yui3-tooltip .yui3-tooltip-align-bottom .yui3-widget-ft div{top:0;border-color:#efefef transparent}.tooltip-label{-moz-box-shadow:3px 3px 6px rgba(0,0,0,0.3);-webkit-box-shadow:3px 3px 6px rgba(0,0,0,0.3);box-shadow:3px 3px 6px rgba(0,0,0,0.3);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;background:#fff;border:1px solid #dfdcd9;display:none;font-size:13px;line-height:1;margin:0;padding:6px 5px;position:absolute;top:-20px;white-space:nowrap;z-index:1000}body,a:link,a:visited{-webkit-font-smoothing:antialiased}code,pre,p{line-height:1.5}body{font-size:16px}@media only screen and (min-width: 768px){code,pre,p{line-height:1.6}body{font-size:16px}}@media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi){body{font-size:18px}}.not-for-medium{display:none}@media only screen and (min-width: 985px){.not-for-medium{display:block}}header.banner{background:#000;-moz-box-shadow:inset 0 2px 2px -2px #000;-webkit-box-shadow:inset 0 2px 2px -2px #000;box-shadow:inset 0 2px 2px -2px #000;margin-bottom:0}header.banner .nav-primary{-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;*zoom:1}header.banner .nav-primary:before,header.banner .nav-primary:after{content:"";display:table}header.banner .nav-primary:after{clear:both}header.banner nav.nav-primary{border-bottom:1px solid #262626;overflow:visible}header.banner nav.nav-primary .user-nav{float:right;margin-right:20px}header.banner nav.nav-primary .user-dropdown:hover ul:after{display:none}header.banner nav.nav-primary .user-dropdown .menu-link img{margin-right:10px}header.banner nav.nav-primary .user-dropdown .menu-link img.hover{display:none}header.banner nav.nav-primary .user-dropdown .menu-link img.normal{display:inline-block}header.banner nav.nav-primary .user-dropdown .open .menu-link img.hover,header.banner nav.nav-primary .user-dropdown .menu-link:hover img.hover{display:inline-block}header.banner nav.nav-primary .user-dropdown .open .menu-link img.normal,header.banner nav.nav-primary .user-dropdown .menu-link:hover img.normal{display:none}header.banner nav.nav-primary .user-dropdown ul{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;margin-top:-2px;background-color:#fff;border-width:0}header.banner nav.nav-primary .user-dropdown ul a:hover{background-color:transparent}header.banner nav.nav-primary #user-dropdown .dropdown ul{width:auto}header.banner .nav-primary.nav-right .logo-ubuntu{-moz-background-size:73px 30px;-webkit-background-size:73px 30px;-o-background-size:73px 30px;background-size:73px 30px;background-image:url(../img/logos/logo.svg);background-position:20px;background-repeat:no-repeat;min-width:120px;padding-top:6px;margin-left:0}body.no-svg header.banner .nav-primary.nav-right .logo-ubuntu{background-image:url(../img/logos/logo.png)}input[type=text]::-ms-reveal,input[type=text]::-ms-clear{display:none;width:0;height:0}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-results-button,input[type="search"]::-webkit-search-results-decoration{display:none}.contextual-bar{overflow:hidden;background-color:#fff;border-bottom:1px solid #d4d4d4}form.search-form{overflow:hidden;float:right;width:100%;position:relative}form.search-form input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;border:0;border-left:0;margin:0;width:100%;height:50px;float:left;font-size:1em;padding-top:0;padding-bottom:0;padding-right:30px;background-color:transparent;-webkit-appearance:none}form.search-form input:focus{border-color:#dd4814}form.search-form button[type=submit],form.search-form button[type=submit]:hover{position:absolute;top:10px;right:10px;display:block;height:30px;width:30px;padding:0;line-height:0;-webkit-appearance:none;background:transparent}form.search-form button img{height:16px}.contextual-nav{border:0;display:block;margin:0;padding-left:10px;background-color:transparent;overflow:hidden;float:left}.contextual-nav li,.contextual-nav li:last-child{font-size:0.875em;float:left;list-style-type:none;margin:0;margin-left:5px}.contextual-nav li a:link,.contextual-nav li a:visited,.contextual-nav .contextual-nav__label{display:block;color:#333;font-weight:300;text-align:center;padding:16px 10px 10px 10px;border-bottom:3px solid transparent}.contextual-nav .contextual-nav__label{color:#cdcdcd}.contextual-nav li a:hover{border-bottom-color:#dd4814;text-decoration:none;color:#dd4814}.contextual-nav li a.active{border-bottom:3px solid #dd4814}.opera-mini header.banner .logo-ubuntu,.no-svg header.banner .logo-ubuntu{background-image:url(../img/logos/logo.png)}@media only screen and (min-width: 769px){header.banner .nav-primary ul li,header.banner .nav-primary ul li:last-child{border-bottom:0;width:auto}header.banner nav.nav-primary li a:link,header.banner nav.nav-primary li a:visited{border-left:1px solid #262626;font-weight:400}header.banner nav.nav-primary ul li a.active{padding-bottom:10px;background-color:#0e0c0b;border-bottom:3px solid #dd4814;border-left:1px solid #262626}header.banner nav.nav-primary ul li{border-left:1px solid #262626}header.banner nav.nav-primary ul li a:hover{background-color:#dd4814}header.banner nav.nav-primary ul{background-color:transparent;border-right:1px solid #262626;display:block}header.banner nav.nav-primary ul li:last-child{border-left:1px solid #262626;border-right:0}header.banner .nav-primary ul li a:active,header.banner .nav-primary ul li a:hover,header.banner .nav-primary ul li a:visited,header.banner nav.nav-primary ul li a:link{border-left:0}header.banner .nav-primary ul li a.external:hover{background-image:url("../img/icons/external-link-grey.png")}form.search-form{width:325px}form.search-form input{border-left:1px solid #d4d4d4;margin:0 20px;width:250px;font-size:0.875em}}@media only screen and (min-width: 1030px){header.banner{height:48px;overflow:hidden}header.banner .nav-primary{width:100%}}body{background-repeat:repeat}.row{border:0;background-color:rgba(255,255,255,0.6)}@media only screen and (min-width: 769px){.append-one{margin-right:10.6%}.row{padding:50px 40px 30px}}.inner-wrapper{*zoom:1;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;background-color:transparent;background-image:none;margin:0 auto;padding-bottom:0;float:none}.inner-wrapper:before,.inner-wrapper:after{content:"";display:table}.inner-wrapper:after{clear:both}.wrapper{position:static;background:transparent;width:100%;overflow:hidden}img.touch-border{margin-bottom:-50px}.inner-wrapper,footer.global .legal{max-width:1030px;width:auto;padding-left:0;padding-right:0}.touch-top{margin-top:-50px}@media only screen and (max-width: 1030px){.inner-wrapper,footer.global .legal{padding-left:8px;padding-right:8px;width:auto}}.footer-cta{background:#fff;padding-bottom:20px}.footer-wrapper.strip-light{background-color:#fff}.solutions-cta{height:60px;background-color:#dd4814;line-height:60px;text-align:center}.solutions-cta a{color:#fff;font-size:1.25em}footer.global{background-color:white;box-shadow:none;padding-top:0}footer.global .row{padding:10px 0 0}footer.global .two-col{width:46%;float:left;display:inline-block;min-height:200px}footer.global h2{padding-bottom:0;color:#888;font-size:16px}footer.global nav .canonlist ul li,footer.global nav .additional-info ul li{min-height:0;width:48%;float:left}footer.global ul.bullets li:after{line-height:1;color:#888;content:"•";vertical-align:middle;margin:0 5px}footer.global ul.inline li:last-child{width:auto}footer.global a.external{background-image:url("../img/icons/external-link-dark.png")}footer.global .top-link{margin-bottom:10px}footer.global a{color:#333}footer.global a:hover{color:#dd4814}footer.global .legal{background-image:none}footer.global .legal.has-cookie{padding-bottom:70px}footer.global .inner-wrapper{overflow:visible}footer.global a.link-cta-positive,footer.global a.link-cta-negative{width:auto;margin-top:10px;padding-left:20px;padding-right:20px;color:#fff;font-size:14px}footer.global .section__title{background:none;cursor:default}.legal-inner{clear:both;overflow:hidden;float:left;width:100%;padding:20px 10px 0;margin:-3px -10px 0}.social,.social--right{margin-left:0}.social .social__item,.social--right .social__item{display:inline;float:left;padding-right:1em}.social .social__google,.social .social__facebook,.social .social__twitter,.social--right .social__google,.social--right .social__facebook,.social--right .social__twitter{background-image:url("../img/icons/icon-social.png");display:block;width:45px;height:44px}.social .social__google.social__twitter:hover,.social .social__facebook.social__twitter:hover,.social .social__twitter.social__twitter:hover,.social--right .social__google.social__twitter:hover,.social--right .social__facebook.social__twitter:hover,.social--right .social__twitter.social__twitter:hover{background-position:0 -45px}.social .social__google.social__facebook,.social .social__facebook.social__facebook,.social .social__twitter.social__facebook,.social--right .social__google.social__facebook,.social--right .social__facebook.social__facebook,.social--right .social__twitter.social__facebook{background-position:90px 0}.social .social__google.social__facebook:hover,.social .social__facebook.social__facebook:hover,.social .social__twitter.social__facebook:hover,.social--right .social__google.social__facebook:hover,.social--right .social__facebook.social__facebook:hover,.social--right .social__twitter.social__facebook:hover{background-position:90px -45px}.social .social__google.social__google,.social .social__facebook.social__google,.social .social__twitter.social__google,.social--right .social__google.social__google,.social--right .social__facebook.social__google,.social--right .social__twitter.social__google{background-position:135px 0}.social .social__google.social__google:hover,.social .social__facebook.social__google:hover,.social .social__twitter.social__google:hover,.social--right .social__google.social__google:hover,.social--right .social__facebook.social__google:hover,.social--right .social__twitter.social__google:hover{background-position:135px -45px}@media only screen and (min-width: 768px){.social--right{float:right}}#additional-info{border-bottom:0}#additional-info h2:before{background-image:url("../img/icons/external-link-grey.svg"),none;background-repeat:no-repeat;background-size:14px 14px;content:"";display:inline-block;height:15px;margin-right:3px;position:relative;top:3px;width:15px}#additional-info div li{border-left:1px solid #d4d7d4;box-sizing:border-box;display:block;float:left;margin:0;padding:0;width:50%}#additional-info div li a{border-bottom:1px solid #d4d7d4;box-sizing:border-box;color:#333333;display:block;float:left;margin:0;overflow:hidden;padding:8px 10px;text-align:left;white-space:normal;width:100%}#additional-info .section__title{border-bottom:1px solid #d4d7d4;background-position:100% .1em}html.opera-mini footer #nav-global h2:before,html.opera-mini footer #additional-info h2:before,html.no-svg footer #nav-global h2:before,html.no-svg footer #additional-info h2:before{background-image:url("../img/icons/external-link-grey.png")}@media only screen and (min-width: 769px){.footer-wrapper.strip-light{white-space:nowrap}footer.global{padding-top:40px;padding-bottom:40px}footer.global .two-col{width:14.89361%;display:inline-block;min-height:0}footer.global .section{min-height:160px;margin-right:40px;padding-bottom:0;border-right:1px dotted #aaa;border-bottom:0}footer.global .section:last-child{margin-right:0;border-right:0}footer.global li{display:inline;float:left}footer.global ul.no-bullets li{border-right:1px dotted #aaa;padding-right:15px;padding-left:15px}footer.global ul.no-bullets li a{font-size:16px}footer.global ul.no-bullets li a:hover{color:#dd4814}footer.global ul.no-bullets li:last-child{border-right:none}footer.global ul.no-bullets li:first-child{padding-left:0px}#additional-info .section__title{border-bottom:0}#additional-info div li,#additional-info div a:link{width:100%;border:0}}.actions .actions__social-item--twitter,.actions .actions__social-item--google-plus{text-indent:-99999px;background-image:url("../img/icons/icon-social.svg");background-repeat:no-repeat;height:44px;width:44px;overflow:hidden;display:block}.actions .actions__social-item--twitter{background-position:0 0}.actions .actions__social-item--twitter:hover{background-position:0 -45px}.actions .actions__social-item--google-plus{background-position:-45px 0}.actions .actions__social-item--google-plus:hover{background-position:-45px -45px}.anchor{display:inline-block;margin-left:3px;opacity:.0;position:relative;top:1px;width:1em;height:1em;background:url("../img/icons/anchor_16.svg") 0 80% no-repeat;background-size:16px;-moz-transition:opacity .1s;-webkit-transition:opacity .1s;transition:opacity .1s}h1:hover .anchor,h2:hover .anchor,h3:hover .anchor,h4:hover .anchor,dt:hover .anchor,li:hover .anchor{opacity:1}.box{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-moz-box-shadow:none;-webkit-box-shadow:none;box-shadow:none;display:block;margin-bottom:0;border-top:0;border-left:0;border-right:0;padding-left:0;padding-right:0}.box-dim{background-color:#fafafa}@media only screen and (min-width: 768px){.box{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-moz-box-shadow:0px 1px 1px 0px rgba(0,0,0,0.15);-webkit-box-shadow:0px 1px 1px 0px rgba(0,0,0,0.15);box-shadow:0px 1px 1px 0px rgba(0,0,0,0.15);display:inline-block;margin-bottom:20px;padding-left:20px;padding-right:20px;border:0}}a.indent{-moz-box-shadow:inset 0 1px 2px 0 #333;-webkit-box-shadow:inset 0 1px 2px 0 #333;box-shadow:inset 0 1px 2px 0 #333;background:rgba(0,0,0,0.1);padding:10px 30px;text-weight:normal}a.indent:hover{background:rgba(0,0,0,0.2)}a.link-cta-positive,a.link-cta-negative{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-color:#dd4814;color:#fff;display:inline-block;font-size:1.14286em;font-weight:300;text-decoration:none;margin:0;padding:8px 14px;text-align:center;-moz-transition:background .2s;-webkit-transition:background .2s;transition:background .2s;width:100%}a.link-cta-positive:hover,a.link-cta-negative:hover{background-color:#ae3910}a.link-cta-positive .external,a.link-cta-negative .external{padding-right:1em;background-image:url("../img/icons/external-link-white.svg");background-repeat:no-repeat;background-size:11px;background-position:right top}@media only screen and (min-width: 769px){a.link-cta-positive .external,a.link-cta-negative .external{padding-right:.7em}}a.link-cta-negative{background-color:#b2b2b2}a.link-cta-negative:hover{background-color:#888}.charms__list{list-style:none;margin-bottom:1em;margin-left:0;border-bottom:1px dotted #d4d4d4}.charms__list .charms__list--config{display:none}.charms__list .charms__list--toggle{display:block}.charms__list .charms__list--toggle.is-open+.charms__list--config{display:block}.charms__list .charms__list--config-name{border-top:0}.charms__list--item{font-size:1em;border-top:1px dotted #d4d4d4;padding:10px 0 0 10px;margin-bottom:10px}.charms__list--item:last-of-type{margin-bottom:10px}.charms__list--icon{margin-right:.4em;width:25px;height:25px}.charms__list--toggle{background:url("../img/shared/icon-arrow-down.svg") no-repeat center center;width:16px;height:100%;float:right;text-indent:-99999px;margin-right:20px}.charms__list--toggle.is-open{background-image:url("../img/shared/icon-arrow-up.svg");background-size:14px}.charms__list--config{padding-left:35px;padding-bottom:20px}.charms__list--config-name{font-size:1em;margin-top:15px;padding-top:15px;font-weight:400;border-top:1px dotted #d4d4d4}.charms__list--config-name:first-of-type{border-top:0}.charms__list--config-type{font-weight:400}.charms__list--config-description,.charms__list--config-setting{margin-left:30px;margin-top:8px}.charms__list--config-setting{font-size:0.875em;color:#888;font-family:"Ubuntu Mono","Consolas","Monaco","Lucida Console","Courier New",Courier,monospace}body.no-svg .charms__list .charms__list--toggle{background-image:url("../img/shared/icon-arrow-down.png")}body.no-svg .charms__list .charms__list--toggle.is-open{background-image:url("../img/shared/icon-arrow-up.png")}pre{background:transparent;border:1px solid #888;margin:0 0 1.5em 0}pre:not(:first-child){margin-top:1.5em}code.language-bash .comment{color:#888}.cookie-policy{-moz-box-shadow:0 -1px 2px rgba(0,0,0,0.2);-webkit-box-shadow:0 -1px 2px rgba(0,0,0,0.2);box-shadow:0 -1px 2px rgba(0,0,0,0.2);background-color:#fae4dc;bottom:0;position:fixed;width:100%;z-index:100}.cookie-policy p{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-size:13px;margin-bottom:0;margin-left:0;padding:8px 0;width:100%}.cookie-policy .link-cta{background-image:url(../img/icons/close-orange.svg);background-repeat:no-repeat;color:#fff;float:right;font-size:1em;height:15px;margin:12px 0;margin-top:12px;padding:0;text-decoration:none;text-indent:-9999px;width:16px}html.no-svg .cookie-policy .link-cta,html.opera-mini .cookie-policy .link-cta{background-image:url(../img/icons/close-orange.png)}html.opera-mini .cookie-policy{position:relative;top:0}.deploy-command{margin-bottom:10px;position:relative}.deploy-command .deploy-command__field{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px 4px 4px 4px;-moz-border-radius:4px 4px 4px 4px;border-radius:4px 4px 4px 4px;-moz-box-shadow:inset 0 1px 2px 0 rgba(0,0,0,0.12);-webkit-box-shadow:inset 0 1px 2px 0 rgba(0,0,0,0.12);box-shadow:inset 0 1px 2px 0 rgba(0,0,0,0.12);background-image:url("../img/icons/code-snippet_16.svg");background-repeat:no-repeat;background-position:5px center;background-color:#fff;background-size:1.142857143em;width:100%;height:37px;border:1px solid #c1c1c1;padding:.6em;color:#888;padding-left:2em;font-size:0.875em;white-space:nowrap;overflow:hidden;cursor:text}.deploy-command .command2clipboard__clip{cursor:pointer;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;line-height:1;position:absolute;right:1px;top:1px;background-color:#fff;padding:9px 8px 7px;border-left:1px solid #b2b2b2;display:none}.deploy-command .command2clipboard__clip.zeroclipboard-is-hover{background-color:#eee}@media only screen and (min-width: 1030px){.deploy-command .command2clipboard__clip{display:inline-block}}.dropdown-menu{position:relative;display:block}.dropdown-menu.open .menu-link{background-color:#000}.dropdown-menu.open .dropdown{display:block}.dropdown-menu .menu-link .border-box{display:block;color:#f2f2f4}.dropdown-menu .dropdown{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;display:none;position:absolute;z-index:1000;top:0;left:0;right:0;width:auto;background-color:#fff;box-shadow:0 1px 5px rgba(0,0,0,0.2)}.dropdown-menu .dropdown.right{left:auto;right:0;text-align:right}.dropdown-menu .dropdown.narrow{min-width:140px;width:auto}.dropdown-menu .dropdown a,.dropdown-menu .dropdown p,.dropdown-menu .dropdown li{color:#333}.dropdown-menu .dropdown p{padding:11px 20px}.dropdown-menu .dropdown header,.dropdown-menu .dropdown footer{background-color:#fff}.dropdown-menu .dropdown header{padding:11px 20px;color:#f2f2f4;font-size:16px;font-weight:300}.dropdown-menu .dropdown footer{padding:20px}.dropdown-menu .dropdown ul{width:auto;left:0;right:0}.dropdown-menu .dropdown ul li a{width:auto;display:block;padding:15px 20px}.files .files__list{list-style:none;margin-bottom:1em;border-left:1px solid  #cbcbcb;margin-left:1em}@media only screen and (min-width: 768px){.files .files__list{margin-left:0}}.files .files__list li{position:relative}.files .files__list li a:link,.files .files__list li a:visited{color:#333;text-decoration:none}.files .files__list li:before{content:'';width:12px;height:1px;background:#d4d4d4;display:inline-block;position:relative;top:-4px;margin-right:5px}.files .files__list li:last-child:after{content:'';width:4px;height:1em;position:absolute;display:block;left:-2px;top:.85em;background:#fff}.files .files__list ul:last-child>li a:after{content:'';width:4px;height:3em;position:absolute;display:block;left:-1.8em;top:-1.45em;background:white;cursor:default}.files .files__list .files__list{margin-left:1.3em}.files .files__list .files__list--item,.files .files__list .files__list--item-folder{font-size:0.875em;margin-bottom:0.75em}.files .files__list .files__list--item-folder{background-position:center right;background-size:12px;cursor:pointer}.files .files__list .files__list--item-folder:after{font-size:14px;display:block;content:"-";position:absolute;left:-7px;top:4px;padding:0 4px;line-height:0.9em;background:#fff;border:1px solid #888}.files .files__list .files__list--item-folder.is-closed+ul{display:none}.files .files__list .files__list--item-folder.is-closed:after{content:"+";padding:0 2px}.files .files__actions--launchpad{background:url("../img/icons/icon-launchpad.svg") no-repeat;padding-left:1.4em}#main-content .row-hero{padding-top:20px;margin-top:0}#main-content .row-hero .intro{font-size:16px}@media only screen and (min-width: 769px){#main-content .row-hero{padding-top:60px}#main-content .row-hero .intro{font-size:1.4375em;margin-bottom:40px}}.how-to div div img{float:left;margin:0 20px 20px 0}header.banner a.external,header.banner a.external:hover{background-image:url("../img/icons/external-link-grey.png")}a.external,a.external:hover,header.banner nav.nav-primary ul li a.external:link,header.banner nav.nav-primary ul li a.external:visited,header.banner nav.nav-primary ul li a.external:hover{background-repeat:no-repeat}a.external,a.external:hover header.banner nav.nav-primary ul li a.external:link,header.banner nav.nav-primary ul li a.external:visited,header.banner nav.nav-primary ul li a.external:hover{background-position:right 14px top 14px;padding-right:35px;background-size:auto}@media only screen and (max-width: 769px){header.banner nav.nav-primary ul li a.external:link,header.banner nav.nav-primary ul li a.external:visited,header.banner nav.nav-primary ul li a.external:hover{background:none}header.banner nav.nav-primary ul li a.external:after{display:inline-block;width:11px;height:11px;margin-left:0.25em;background-image:url("../img/icons/external-link-dark.png");vertical-align:text-top}}.list__icons{margin-left:0;margin-bottom:5px}.list__icons li{list-style:none;float:left;padding:8px 8px 0 0;margin-bottom:0}.list__icons li img{width:24px;height:24px;vertical-align:top}.list__tick{list-style-image:url("../img/icons/tick.png")}.list__middot{margin-left:0;list-style:none}.list__middot li{display:inline}.list__middot li:after{content:"•";color:#888;margin:0 5px 0 8px;vertical-align:middle}.list__middot li.files__actions--last:after{content:""}.combined-list .list li{border-bottom:1px dotted #888;padding:10px 0}@media only screen and (max-width: 767px){.combined-list .last-col .list li:last-of-type{border-bottom:0;padding-bottom:0}}@media only screen and (min-width: 768px){.combined-list .list li:last-of-type{border-bottom:0;padding-bottom:0}}.events-list li{position:relative;padding-bottom:20px}.events-list dd{margin-left:0;background-position:0 center;background-repeat:no-repeat;background-size:20px 20px;padding:6px 20px 6px 24px}.events-list .event-map{display:none}.events-list .event-date{background-image:url("../img/icons/calendar.svg")}.events-list .location{background-image:url("../img/icons/location.svg")}@media only screen and (min-width: 769px){.events-list .event-details-wrapper{padding-left:120px}.events-list .event-map{-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px;position:absolute;left:0;top:0;height:100px;width:100px;float:left;margin-right:10px;margin-top:5px;overflow:hidden;display:block}}body.no-svg .events-list .event-date{background-image:url("../img/icons/calendar.png")}body.no-svg .events-list .location{background-image:url("../img/icons/location.png")}.maintainers .maintainer__email{display:block}.ratings ul{margin-left:2px;margin-bottom:0}.ratings ul li{margin-bottom:0}.ratings ul li img{vertical-align:text-top}.ratings ul li:first-of-type{margin-left:0}.revisions__list{list-style:none;margin-left:0}.revisions__list .revisions__list-item{margin-bottom:1em}.revisions__list .revisions__list_meta{color:#888;margin-bottom:.2em}.revisions__list .revisions__list_meta_date{float:right}.section{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;overflow:hidden;padding-bottom:20px;padding-top:20px}.section .section__title{background:url(../img/shared/icon-arrow-up.svg) no-repeat center right;cursor:pointer;margin-bottom:1em}.section.is-closed{height:60px}.section.is-closed .section__title{background-image:url(../img/shared/icon-arrow-down.svg)}.no-svg .row.section .section__title{background:url(../img/shared/icon-arrow-up.png)}.no-svg .row.section.is-closed .section__title{background:url(../img/shared/icon-arrow-down.png)}footer .section{margin-bottom:1em;padding-bottom:1em}footer .section.is-closed{height:auto;padding-bottom:0}footer .section.is-closed ul{display:none}@media only screen and (min-width: 769px){.row .section .section__title{background-image:none;cursor:auto}.row .section.is-closed{height:auto}}.list--concealed .list-item{display:none}.list--concealed .list-item:first-of-type{display:list-item}.list--concealed.list--visible-6 .list-item:nth-child(-n+6){display:list-item}.list--concealed.list--visible-4 .list-item:nth-child(-n+4){display:list-item}.list--concealed.list--visible-2 .list-item:nth-child(-n+2){display:list-item}.list--concealed a.btn__see--less{display:none}.list--concealed a.btn__see--more{display:inline}.list--revealed .list__controls,.list--concealed .list__controls{display:block;margin-top:2em}.list--revealed .list--item{display:list-item}.list--revealed a.btn__see--less{display:inline}.list--revealed a.btn__see--more{display:none}a.btn__see--more,a.btn__see--less{-moz-transition:background .2s;-webkit-transition:background .2s;transition:background .2s;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;color:#333;border-radius:2px;border:1px solid #b2b2b2;background:#fff;padding:0.384615385em 1.153846154em}a.btn__see--more:hover,a.btn__see--less:hover{background:#eee;text-decoration:none}.strip-dark,.strip-light{clear:both}.strip-dark{background-color:#2c001e;background-image:none;background-repeat:repeat;color:#fff}.strip-dark.solid{background-image:none;background-color:#2c001e}.strip-dark ul,.strip-dark ol{margin:0;padding:0}.strip-dark .icon,.strip-dark ol span{-moz-background-size:40px 40px;-webkit-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;background-image:url(../img/icons/list-icon-background.png);background-repeat:no-repeat;display:block;margin:0 20px 20px 0;padding:24px;float:left;width:16px;height:16px;padding:12px}.strip-light .icon,.strip-dark .icon{position:absolute}.strip-light{background-color:rgba(255,255,255,0.6)}.strip-dark ol,.strip-dark ul{padding:20px 0}.strip-light .icon{display:block;background-image:url(../img/icons/list-icon-background.png);padding:24px;margin:0 auto 48px}.strip-dark .connected-list li,.strip-light .connected-list li{margin-bottom:10px;min-height:52px}.strip-dark .connected-list li p,.strip-light .connected-list li p,.strip-dark .connected-list li h3,.strip-light .connected-list li h3{padding-left:50px}.strip-dark ol.connected-list li p .strip-dark ol.connected-list li h3{padding-left:50px}.strip-dark ol.connected-list li span{float:left;font-size:22px;font-weight:normal;height:26px;margin-left:0;margin-right:20px;padding-top:2px;position:absolute;text-align:center;width:16px}.strip-white{background:#fff}.strip-trans{background:transparent}.strip-green{background-image:linear-gradient(to right, #6fad23 0%, #7cc227 100%);overflow:hidden}.strip-green,.strip-green a{color:#fff}.strip-blue{background-image:linear-gradient(to right, #1076a2 0%, #359fcd 100%);overflow:hidden}.strip-blue,.strip-blue a{color:#fff}.tag-list{list-style:none;margin:0}.tag-list--item{display:inline-block;text-transform:lowercase}.tag-list--item a:link,.tag-list--item a:visited{color:#333}.tag-list--item a:after{content:','}.tag-list--item:last-child a:after{content:''}#twitter-feed,#blog-feed{margin:35px 0}#twitter-feed>ul,#blog-feed>ul{list-style:none;margin-left:0}#twitter-feed>ul li,#blog-feed>ul li{position:relative;margin-bottom:30px}#twitter-feed .user,#blog-feed .user{font-size:0.875em;margin-bottom:0.5em}#twitter-feed .user img,#blog-feed .user img{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;width:24px;height:24px;vertical-align:middle;margin-right:5px}#twitter-feed .user a:link,#twitter-feed .user a:visited,#twitter-feed .user a:hover,#blog-feed .user a:link,#blog-feed .user a:visited,#blog-feed .user a:hover{text-decoration:none}#twitter-feed .user span[data-scribe="element:name"],#blog-feed .user span[data-scribe="element:name"]{color:#333}#twitter-feed .tweet,#blog-feed .tweet{padding-left:33px;margin-bottom:.3em}#twitter-feed .timePosted,#blog-feed .timePosted{padding-left:33px;font-size:0.875em}#twitter-feed .interact,#blog-feed .interact{padding-left:33px}#twitter-feed .interact a:link,#twitter-feed .interact a:visited,#blog-feed .interact a:link,#blog-feed .interact a:visited{margin-right:20px}@media only screen and (min-width: 769px){#twitter-feed .timePosted{position:absolute;top:0;right:0;padding-left:0}}.spaced-segment{margin-bottom:50px}.spaced-segment h3{margin-bottom:1.3em}.strip-dark,.strip-light{clear:both}.strip-dark{background-color:#2c001e;background-image:none;background-repeat:repeat;color:#fff}.strip-dark.solid{background-image:none;background-color:#2c001e}.strip-dark ul,.strip-dark ol{margin:0;padding:0}.strip-dark .icon,.strip-dark ol span{-moz-background-size:40px 40px;-webkit-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;background-image:url(../img/icons/list-icon-background.png);background-repeat:no-repeat;display:block;margin:0 20px 20px 0;padding:24px;float:left;width:16px;height:16px;padding:12px}.strip-light .icon,.strip-dark .icon{position:absolute}.strip-light{background-color:rgba(255,255,255,0.6)}.strip-dark ol,.strip-dark ul{padding:20px 0}.strip-light .icon{display:block;background-image:url(../img/icons/list-icon-background.png);padding:24px;margin:0 auto 48px}.strip-dark .connected-list li,.strip-light .connected-list li{margin-bottom:10px;min-height:52px}.strip-dark .connected-list li p,.strip-light .connected-list li p,.strip-dark .connected-list li h3,.strip-light .connected-list li h3{padding-left:50px}.strip-dark ol.connected-list li p .strip-dark ol.connected-list li h3{padding-left:50px}.strip-dark ol.connected-list li span{float:left;font-size:22px;font-weight:normal;height:26px;margin-left:0;margin-right:20px;padding-top:2px;position:absolute;text-align:center;width:16px}.strip-white{background:#fff}.strip-trans{background:transparent}.strip-green{background-image:linear-gradient(to right, #6fad23 0%, #7cc227 100%);overflow:hidden}.strip-green,.strip-green a{color:#fff}.strip-blue{background-image:linear-gradient(to right, #1076a2 0%, #359fcd 100%);overflow:hidden}.strip-blue,.strip-blue a{color:#fff}@media only screen and (min-width: 769px){.tip,.command2clipboard__clip{position:relative;display:inline-block}.tip .tip-content,.command2clipboard__clip .tip-content{position:absolute;z-index:98;left:-1000px;right:-1000px;top:-30px;font-weight:300;margin:auto;display:block;text-align:center;white-space:nowrap}.tip:hover .tip-content:after,.command2clipboard__clip.zeroclipboard-is-hover .tip-content:after{display:table;z-index:98;margin:auto;color:#fff;border-radius:3px;background:#000;box-shadow:none;font-size:12px;content:attr(data-tooltip);padding:4px 6px;white-space:nowrap;text-align:center}.tip:hover .tip-content:before,.command2clipboard__clip.zeroclipboard-is-hover .tip-content:before{position:absolute;top:100%;left:50%;margin-left:-5px;content:'';border:solid transparent;border-width:5px;border-top-color:#000}}.fake{display:block}*{margin:0}html{height:100%}body{height:100%;font-size:1.0em;font-family:'Ubuntu', Arial, 'libra sans', sans-serif;font-weight:300}hr{border:none;background:#B2B2B2;width:100%;height:1px;display:block;width:100%;float:left;margin-bottom:20px}ul,ol{margin-left:0}a:link,a:visited{color:#333;text-decoration:none;border-bottom:1px solid #CDCDCD}a:link:hover,a:visited:hover{color:#dd4814;text-decoration:none}a:active,a:focus{outline:none}::selection{color:#FFF;background:#dd4814}::-moz-selection{color:#FFF;background:#dd4814}@font-face{font-family:"Ubuntu";font-style:normal;font-weight:300;src:url("../fonts/ubuntu-l-webfont.eot?") format("eot"),url("../fonts/ubuntu-l-webfont.woff") format("woff"),url("../fonts/ubuntu-l-webfont.ttf") format("truetype"),url("../fonts/ubuntu-l-webfont.svg#Ubuntu") format("svg")}@font-face{font-family:"Ubuntu";font-style:italic;font-weight:300;src:url("../fonts/ubuntu-li-webfont.eot?") format("eot"),url("../fonts/ubuntu-li-webfont.woff2") format("woff2"),url("../fonts/ubuntu-li-webfont.woff") format("woff"),url("../fonts/ubuntu-li-webfont.ttf") format("truetype"),url("../fonts/ubuntu-li-webfont.svg#Ubuntu") format("svg")}@font-face{font-family:"Ubuntu";font-style:normal;font-weight:400;src:url("../fonts/ubuntu-r-webfont.eot?") format("eot"),url("../fonts/ubuntu-r-webfont.woff") format("woff"),url("../fonts/ubuntu-r-webfont.ttf") format("truetype"),url("../fonts/ubuntu-r-webfont.svg#Ubuntu") format("svg")}@font-face{font-family:"Ubuntu";font-style:normal;font-weight:500;src:url("../fonts/ubuntu-m-webfont.eot?") format("eot"),url("../fonts/ubuntu-m-webfont.woff") format("woff"),url("../fonts/ubuntu-m-webfont.ttf") format("truetype"),url("../fonts/ubuntu-m-webfont.svg#Ubuntu") format("svg")}@font-face{font-family:"Ubuntu";font-style:italic;font-weight:500;src:url("../fonts/ubuntu-mi-webfont.eot?") format("eot"),url("../fonts/ubuntu-mi-webfont.woff2") format("woff2"),url("../fonts/ubuntu-mi-webfont.woff") format("woff"),url("../fonts/ubuntu-mi-webfont.ttf") format("truetype"),url("../fonts/ubuntu-mi-webfont.svg#Ubuntu") format("svg")}@font-face{font-family:"Ubuntu";font-style:normal;font-weight:700;src:url("../fonts/ubuntu-b-webfont.eot?") format("eot"),url("../fonts/ubuntu-b-webfont.woff2") format("woff2"),url("../fonts/ubuntu-b-webfont.woff") format("woff"),url("../fonts/ubuntu-b-webfont.ttf") format("truetype"),url("../fonts/ubuntu-b-webfont.svg#Ubuntu") format("svg")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:400;src:url("https://themes.googleusercontent.com/static/fonts/ubuntu/v5/GZMdC02DTXXx8AdUvU2etw.woff") format("woff")}@font-face{font-family:'Ubuntu';font-style:italic;font-weight:700;src:url("https://themes.googleusercontent.com/static/fonts/ubuntu/v5/pqisLQoeO9YTDCNnlQ9bfz8E0i7KZn-EPnyo3HZu7kw.woff") format("woff")}.accordion{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;list-style:none;background:#FFF;box-shadow:0 1px 1px rgba(0,0,0,0.1);margin-bottom:40px}.disabled .accordion{opacity:.5;pointer-events:none}.accordion .accordion__title{border-bottom:1px dotted #B2B2B2;padding:13px 20px 12px;margin:0;font-size:1.3em}.accordion .accordion__tab{border-bottom:1px dotted #B2B2B2}.accordion .accordion__tab:last-of-type{border:none}.accordion .accordion__tab .accordion__tab-title{padding:12px 20px;margin:0;color:#888;cursor:pointer;background:transparent url("../img/icons/accordion-open.svg") top 20px right 20px no-repeat}.accordion .accordion__tab .accordion__tab-title.active{background-image:url("../img/icons/accordion-close.svg")}.accordion .accordion__tab .accordion__tab-title.active+.accordion__tab-content{max-height:400px;transition:max-height .5s ease-in;overflow-y:auto}.accordion .accordion__tab .accordion__tab-content{max-height:0;transition:max-height .5s ease-out;overflow:hidden}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list{list-style-type:none;padding:0 20px 14px;margin:0}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item{margin-bottom:0.15em}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item .accordion__tab-link{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;color:#333;width:100%;display:inline-block;padding-right:20px;border-bottom:0}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item .accordion__tab-link:hover{color:#dd4814;text-decoration:none}.disabled .accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item .accordion__tab-link{color:#333}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.active{font-weight:400}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.active .accordion__tab-link{background:transparent url("../img/icons/cross.svg") top 7px right 0px no-repeat}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.active:hover{color:#dd4814}.accordion .accordion__tab .accordion__tab-content .accordion__tab-list .accordion__tab-item.active:hover .accordion__tab-link{color:#dd4814;background-image:url("../img/icons/cross-orange.svg")}.cta-group .cta-group__link{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:3px 0px 0px 3px;-moz-border-radius:3px 0px 0px 3px;border-radius:3px 0px 0px 3px;display:inline-block;padding:10px 14px;text-align:center;color:#fff;background-color:#dd4814}.cta-group .cta-group__link:hover{cursor:pointer;text-decoration:none;background-color:#c03f11}.cta-group.secondary .cta-group__link{color:#dd4814;border:1px solid #b2b2b2;background-color:#FFF;line-height:1}.cta-group.secondary .cta-group__link:hover{cursor:pointer;background-color:#F2F2F2}a.link-cta-ubuntu,button.cta-ubuntu,input[type='submit'],form button[type='submit'],form input[type='submit']{color:#fff;font-size:1em;border:none;max-height:37px;border-bottom:0}a.link-cta-ubuntu:hover,button.cta-ubuntu:hover,input[type='submit']:hover,form button[type='submit']:hover,form input[type='submit']:hover{color:#fff}a.link-cta-ubuntu[disabled],a.link-cta-ubuntu.disabled,button.cta-ubuntu[disabled],button.cta-ubuntu.disabled,input[type='submit'][disabled],input[type='submit'].disabled,form button[type='submit'][disabled],form button[type='submit'].disabled,form input[type='submit'][disabled],form input[type='submit'].disabled{cursor:default;opacity:.5}a.link-cta-ubuntu.clear,button.cta-ubuntu.clear,input[type='submit'].clear,form button[type='submit'].clear,form input[type='submit'].clear{background:none;color:#333}a.link-cta-ubuntu.secondary,button.cta-ubuntu.secondary,input[type='submit'].secondary,form button[type='submit'].secondary,form input[type='submit'].secondary{color:#dd4814;border:1px solid #b2b2b2;background:#FFF}a.link-cta-ubuntu.secondary.external,button.cta-ubuntu.secondary.external,input[type='submit'].secondary.external,form button[type='submit'].secondary.external,form input[type='submit'].secondary.external{background-image:url("../img/external-link-black.svg");background-size:16px 16px;background-repeat:no-repeat;background-position:top 8px right 8px}a.link-cta-ubuntu.secondary:hover,button.cta-ubuntu.secondary:hover,input[type='submit'].secondary:hover,form button[type='submit'].secondary:hover,form input[type='submit'].secondary:hover{background-color:#F2F2F2;cursor:pointer}a.link-cta-ubuntu.secondary[disabled],a.link-cta-ubuntu.secondary.disabled,button.cta-ubuntu.secondary[disabled],button.cta-ubuntu.secondary.disabled,input[type='submit'].secondary[disabled],input[type='submit'].secondary.disabled,form button[type='submit'].secondary[disabled],form button[type='submit'].secondary.disabled,form input[type='submit'].secondary[disabled],form input[type='submit'].secondary.disabled{cursor:default;color:#f5ae95;border:1px solid #ddd;background:#FFF;opacity:1}a.link-cta-ubuntu.secondary[disabled]:hover,a.link-cta-ubuntu.secondary.disabled:hover,button.cta-ubuntu.secondary[disabled]:hover,button.cta-ubuntu.secondary.disabled:hover,input[type='submit'].secondary[disabled]:hover,input[type='submit'].secondary.disabled:hover,form button[type='submit'].secondary[disabled]:hover,form button[type='submit'].secondary.disabled:hover,form input[type='submit'].secondary[disabled]:hover,form input[type='submit'].secondary.disabled:hover{background:#FFF}a.link-cta-ubuntu.text-button,button.cta-ubuntu.text-button,input[type='submit'].text-button,form button[type='submit'].text-button,form input[type='submit'].text-button{background-color:transparent;color:#333}a.link-cta-ubuntu.text-button:hover,button.cta-ubuntu.text-button:hover,input[type='submit'].text-button:hover,form button[type='submit'].text-button:hover,form input[type='submit'].text-button:hover{text-decoration:underline}a.link-cta-ubuntu.full,button.cta-ubuntu.full,input[type='submit'].full,form button[type='submit'].full,form input[type='submit'].full{display:block;width:100%}@media screen and (max-width: 768px){a.link-cta-ubuntu,button.cta-ubuntu,input[type='submit'],form button[type='submit'],form input[type='submit']{margin-bottom:20px}}a.link-cta-ubuntu{line-height:20px}.cta-group{float:left;width:auto;clear:both;position:relative;overflow:hidden;min-width:150px}.cta-group .cta-group__link{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;max-height:36px;padding-right:49px;width:100%;line-height:1.2;position:relative;margin:0;text-align:left}.cta-group .cta-group__link:after{-webkit-border-radius:0px 3px 3px 0px;-moz-border-radius:0px 3px 3px 0px;border-radius:0px 3px 3px 0px;content:'';display:block;height:36px;width:34px;background:red;position:absolute;top:0;right:0;background-image:url("../img/chevron-white.svg");background-color:#dd4814;background-repeat:no-repeat;background-position:center}.cta-group .cta-group__link:hover{background-color:#c03f11}.cta-group .cta-group__link:hover:after{background-color:#c03f11}.cta-group .cta-group__dropdown{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;right:0;list-style:none;background:#fff;box-shadow:0 1px 1px rgba(0,0,0,0.1);z-index:20;max-height:1000px;transition:max-height 0.3s ease-in;overflow:hidden;position:relative;clear:both}.cta-group .cta-group__dropdown.ng-hide{display:block !important;max-height:0;overflow:hidden;transition:max-height 0.3s ease-out}.cta-group .cta-group__dropdown .cta-group__item{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;clear:both;padding:5px 10px;margin:0}.cta-group .cta-group__dropdown .cta-group__item a{color:#333;cursor:pointer;width:100%;float:left;margin:0}.cta-group .cta-group__dropdown .cta-group__item a:hover{color:#dd4814;text-decoration:none}.cta-group.secondary .cta-group__link{float:left;max-height:36px;width:100%}.cta-group.secondary .cta-group__link:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background-image:url("../img/icons/accordion-open.svg");background-repeat:no-repeat;background-color:#fff;border:1px solid #b2b2b2;border-left:none;top:-1px;right:-1px}.cta-group.secondary .cta-group__link:hover{background-color:#F2F2F2}.cta-group.secondary .cta-group__link:hover:after{background-color:#F2F2F2}.flash-messages{margin:0px auto;padding:0;max-width:1440px}@media screen and (max-width: 1030px){.flash-messages{margin:0px 10px 20px}}.flash-messages .flash-messages__item{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;list-style:none;padding:15px 20px 15px 45px;margin:0;font-weight:400;font-size:0.875em;background:#FFF;background-position:top 50% left 15px;background-repeat:no-repeat;margin:0 0 20px;box-shadow:0 1px 1px rgba(0,0,0,0.1)}.flash-messages .flash-messages__item.info{background-image:url("../img/icons/info.png");background-image:url("../img/icons/info.svg"),none}.flash-messages .flash-messages__item.success{background-image:url("../img/icons/success.png");background-image:url("../img/icons/success.svg"),none}.flash-messages .flash-messages__item.warning{background-image:url("../img/icons/warning.png");background-image:url("../img/icons/warning.svg"),none}.flash-messages .flash-messages__item.error{background-image:url("../img/icons/error.png");background-image:url("../img/icons/error.svg"),none}input[type='text'],input[type='number'],input[type='search'],input[type='password'],input[type='email'],input[type='url'],textarea,select,tags-input .tags .input,.accounts .api li input[type='text']{-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:textfield;border-radius:2px;border:1px solid #d2d2d2;box-shadow:inset 0 1px 2px rgba(0,0,0,0.12);font-size:16px;margin:0;outline:none;padding:.6956522em .869565em;vertical-align:baseline;font-weight:300}input[type='text']:hover,input[type='number']:hover,input[type='search']:hover,input[type='password']:hover,input[type='email']:hover,input[type='url']:hover,textarea:hover,select:hover,tags-input .tags .input:hover,.accounts .api li input[type='text']:hover{border-color:#B2B2B2;outline:none}input[type='text']:active,input[type='number']:active,input[type='search']:active,input[type='password']:active,input[type='email']:active,input[type='url']:active,textarea:active,select:active,tags-input .tags .input:active,.accounts .api li input[type='text']:active{border-color:#888;outline:none}input[type='text']:focus,input[type='number']:focus,input[type='search']:focus,input[type='password']:focus,input[type='email']:focus,input[type='url']:focus,textarea:focus,select:focus,tags-input .tags .input:focus,.accounts .api li input[type='text']:focus{border-color:#888;outline:none}input.ng-dirty.invalid[type='text'],input.ng-dirty.invalid[type='number'],input.ng-dirty.invalid[type='search'],input.ng-dirty.invalid[type='password'],input.ng-dirty.invalid[type='email'],input.ng-dirty.invalid[type='url'],textarea.ng-dirty.invalid,select.ng-dirty.invalid,tags-input .tags .ng-dirty.invalid.input,.accounts .api li input.ng-dirty.invalid[type='text'],input.ng-dirty.ng-invalid[type='text'],input.ng-dirty.ng-invalid[type='number'],input.ng-dirty.ng-invalid[type='search'],input.ng-dirty.ng-invalid[type='password'],input.ng-dirty.ng-invalid[type='email'],input.ng-dirty.ng-invalid[type='url'],textarea.ng-dirty.ng-invalid,select.ng-dirty.ng-invalid,tags-input .tags .ng-dirty.ng-invalid.input,.accounts .api li input.ng-dirty.ng-invalid[type='text']{border-color:#d90000 !important}input[type='text'] .disabled,input[type='number'] .disabled,input[type='search'] .disabled,input[type='password'] .disabled,input[type='email'] .disabled,input[type='url'] .disabled,textarea .disabled,select .disabled,tags-input .tags .input .disabled,.accounts .api li input[type='text'] .disabled,input[disabled="disabled"][type='text'],input[disabled="disabled"][type='number'],input[disabled="disabled"][type='search'],input[disabled="disabled"][type='password'],input[disabled="disabled"][type='email'],input[disabled="disabled"][type='url'],textarea[disabled="disabled"],select[disabled="disabled"],tags-input .tags [disabled="disabled"].input,.accounts .api li input[disabled="disabled"][type='text']{-webkit-text-fill-color:#333;color:#333;border-color:#e3e3e3;background-color:transparent;cursor:not-allowed}label{position:relative}.disabled label{cursor:default}form li.help-msg{margin-bottom:1em}form li.help-msg .help{color:#888;font-size:0.875em}form label span{color:#888}form fieldset{background:none;margin-left:0;padding:0}input[type='text'],input[type='number'],input[type='search'],input[type='password'],input[type='email'],input[type='url']{padding:7px 10px !important;box-shadow:none;width:100%;border:1px solid #d2d2d2}input[type='text']::-webkit-input-placeholder,input[type='number']::-webkit-input-placeholder,input[type='search']::-webkit-input-placeholder,input[type='password']::-webkit-input-placeholder,input[type='email']::-webkit-input-placeholder,input[type='url']::-webkit-input-placeholder{color:#888}input[type='text']:-moz-placeholder,input[type='number']:-moz-placeholder,input[type='search']:-moz-placeholder,input[type='password']:-moz-placeholder,input[type='email']:-moz-placeholder,input[type='url']:-moz-placeholder{color:#888}input[type='text']::-moz-placeholder,input[type='number']::-moz-placeholder,input[type='search']::-moz-placeholder,input[type='password']::-moz-placeholder,input[type='email']::-moz-placeholder,input[type='url']::-moz-placeholder{color:#888}input[type='text']:-ms-input-placeholder,input[type='number']:-ms-input-placeholder,input[type='search']:-ms-input-placeholder,input[type='password']:-ms-input-placeholder,input[type='email']:-ms-input-placeholder,input[type='url']:-ms-input-placeholder{color:#888}input[type='number']{padding-right:15px}input[type='search']{-webkit-appearance:textfield}input[type='search']::-webkit-search-decoration,input[type='search']::-webkit-search-cancel-button{-webkit-appearance:none}input[type='radio'],input[type='image']{display:inline-block;margin-right:10px}textarea{overflow:auto;height:auto;min-height:175px;padding:7px 10px;max-height:none;vertical-align:top;resize:both;width:100%;box-shadow:none}select{display:block;clear:both;cursor:pointer;margin:0;background-image:url("../img/icons/accordion-open.svg");background-repeat:no-repeat;background-position:top 14px right 10px;background-color:#fff;padding:7px 30px 7px 10px !important;box-shadow:none;width:100%;-moz-appearance:none;text-indent:.01px;text-overflow:''}select[multiple],select[size]{height:auto;background-image:none;padding-top:10px}select:-moz-focusring{color:transparent;text-shadow:0 0 0 #000}select[disabled]{color:#888;background-image:none}select::-ms-expand{display:none}.checkbox:not(:checked),.checkbox:checked{position:absolute;left:-9999px}.checkbox+label{position:relative;padding-left:25px;cursor:pointer;max-width:100%;display:inline;vertical-align:middle;width:auto}.checkbox+label:before{content:'';position:absolute;left:0;top:3px;width:11px;height:11px;border:1px solid #cdcdcd;background:#fff;border-radius:2px}.checkbox:checked+label:before{background-color:#dd4814;border-color:#dd4814}.checkbox:checked+label:after{content:'✔';position:absolute;top:3px;left:2px;font-size:10px;color:#fff;transition:all .2s}.checkbox[disabled]{cursor:not-allowed}.checkbox[disabled]+label{cursor:not-allowed}.checkbox[disabled]+label:before{opacity:.5}.radio:not(:checked),.radio:checked{position:absolute;left:-9999px}.radio+label{position:relative;padding-left:25px;cursor:pointer}.radio+label:before{content:'';position:absolute;left:0;top:1px;width:13px;height:13px;border:1px solid #cdcdcd;background:#fff;border-radius:50%}.radio:checked+label:after{content:'';position:absolute;left:3px;top:4px;width:9px;height:9px;background:#dd4814;border-radius:50%}.field-error,.errors{color:#DF382C}.field-error li,.errors li{margin:7px 0}.field-error .errorlist,.errors .errorlist{margin:0}.field-error .errorlist li,.errors .errorlist li{margin:0 0 14px 0}.inline{display:inline-block;width:100%;font-size:0;margin-bottom:10px}.inline.error{background-color:#fdf5f5;box-shadow:0px 0px 0px 5px #fdf5f5}.inline.error .ng-invalid{border-color:#D2D2D2}.inline:last-of-type{margin-bottom:0}.inline label{display:inline-block;line-height:37px;color:#888;font-size:16px;margin:0}.inline input[type='submit'],.inline input[type='text'],.inline input[type='number'],.inline input[type='search'],.inline input[type='password'],.inline input[type='email'],.inline input[type='checkbox'],.inline select{display:inline-block;clear:none;margin:0;float:none;font-size:16px}.inline input[type='submit']:invalid,.inline input[type='text']:invalid,.inline input[type='number']:invalid,.inline input[type='search']:invalid,.inline input[type='password']:invalid,.inline input[type='email']:invalid,.inline input[type='checkbox']:invalid,.inline select:invalid{-moz-box-shadow:none}.inline input[type='submit']:-moz-submit-invalid,.inline input[type='text']:-moz-submit-invalid,.inline input[type='number']:-moz-submit-invalid,.inline input[type='search']:-moz-submit-invalid,.inline input[type='password']:-moz-submit-invalid,.inline input[type='email']:-moz-submit-invalid,.inline input[type='checkbox']:-moz-submit-invalid,.inline select:-moz-submit-invalid{box-shadow:none}.inline input[type='submit']:-moz-ui-invalid,.inline input[type='text']:-moz-ui-invalid,.inline input[type='number']:-moz-ui-invalid,.inline input[type='search']:-moz-ui-invalid,.inline input[type='password']:-moz-ui-invalid,.inline input[type='email']:-moz-ui-invalid,.inline input[type='checkbox']:-moz-ui-invalid,.inline select:-moz-ui-invalid{box-shadow:none}.inline div{float:none;margin:0}.inline input.cta-ubuntu,.inline a.link-cta-ubuntu,.inline button.cta-ubuntu{font-size:16px}.inline .icon{position:absolute;top:11px;right:10px;cursor:pointer}.inline .error-message{font-size:12px;color:#e85232;margin-top:10px;margin-bottom:10px;font-weight:normal}.form-inline{clear:both}.form-inline label,.form-inline button,.form-inline input[type='submit'],.form-inline input[type='text'],.form-inline input[type='number'],.form-inline input[type='search'],.form-inline input[type='password'],.form-inline input[type='email'],.form-inline input[type='checkbox'],.form-inline select{display:inline-block;width:auto;vertical-align:middle;margin-bottom:0}.form-inline input,.form-inline input[type='submit'] input[type='text'],.form-inline input[type='number'],.form-inline input[type='search'],.form-inline input[type='password'],.form-inline input[type='email'],.form-inline input[type='checkbox'],.form-inline select{margin-left:20px}.form-inline fieldset{width:auto;display:inline-block;margin:0 40px 0 0}.controls{position:absolute;top:0;right:20px}.controls a,.controls button{margin-left:20px}.form .form__siblings{float:left;width:100%}.form .form__siblings:hover .form__group--subtle input,.form .form__siblings:hover .form__group--subtle select,.form .form__siblings:hover .form__group--subtle textarea{border-color:#B2B2B2;background-color:#fff;outline:none}.form .form__siblings.form__siblings--active .form__group--subtle input,.form .form__siblings.form__siblings--active .form__group--subtle select,.form .form__siblings.form__siblings--active .form__group--subtle textarea{border-color:#B2B2B2;background-color:#fff;outline:none}.form .form__group{margin-bottom:10px}.form .form__group .form__group-errors{margin-top:5px}.form .form__group.form__group--inline{width:100%;float:left}.form .form__group.form__group--inline [class*='-col']{margin-bottom:0}.form .form__group.form__group--inline label{display:inline-block;float:none;font-size:16px;margin-top:0;margin-bottom:0;line-height:36px;vertical-align:top}.form .form__group.form__group--inline input,.form .form__group.form__group--inline select,.form .form__group.form__group--inline textarea,.form .form__group.form__group--inline .form__group-input{display:inline-block;clear:none;margin:0;float:none;font-size:16px}.form .form__group.form__group--subtle label{color:#888}.form .form__group.form__group--subtle input,.form .form__group.form__group--subtle select,.form .form__group.form__group--subtle textarea{border-color:#e3e3e3;background-color:transparent}.form .form__group.form__group--subtle input:hover,.form .form__group.form__group--subtle select:hover,.form .form__group.form__group--subtle textarea:hover{border-color:#B2B2B2;background-color:#fff;outline:none}.form .form__group.form__group--subtle input:active,.form .form__group.form__group--subtle input:focus,.form .form__group.form__group--subtle select:active,.form .form__group.form__group--subtle select:focus,.form .form__group.form__group--subtle textarea:active,.form .form__group.form__group--subtle textarea:focus{border-color:#888;outline:none;background-color:#fff}.form.form--inline .form__group{display:inline-block;margin-bottom:0;vertical-align:middle}.form.form--inline .form__group label{display:inline-block;max-width:100%;margin-bottom:0px}.form.form--inline .form__group input,.form.form--inline .form__group select,.form.form--inline .form__group textarea,.form.form--inline .form__group .form__group-input{display:inline-block;width:auto;vertical-align:middle;margin:0}.form .form__help-text{font-size:0.875pxem;color:#888}.onoffswitch{position:relative;display:inline-block;vertical-align:middle;width:38px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none}.onoffswitch-checkbox{display:none}.onoffswitch-label{display:block;overflow:hidden;cursor:pointer;border-radius:2px}.onoffswitch-inner{display:block;width:200%;margin-left:-100%;transition:margin 0.3s ease-in 0s}.onoffswitch-inner:before,.onoffswitch-inner:after{display:block;float:left;width:50%;height:18px;padding:0;line-height:18px;font-size:14px;color:white;font-family:Trebuchet, Arial, sans-serif;font-weight:bold;box-sizing:border-box}.onoffswitch-inner:before{content:"";padding-left:10px;background-color:#3FB24F;color:#FFFFFF}.onoffswitch-inner:after{content:"";padding-right:10px;background-color:#EEEEEE;color:#999999;text-align:right}.onoffswitch-switch{display:block;width:19px;margin:0px;background:#FFFFFF;position:absolute;top:0;bottom:0;right:16px;border:1px solid #D2D2D2;border-radius:2px;transition:all 0.3s ease-in 0s}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-inner{margin-left:0}.onoffswitch-checkbox:checked+.onoffswitch-label .onoffswitch-switch{right:0px}.icon.icon__loading{background:url("../img/in_progress.png") no-repeat;-webkit-animation:spin 1s infinite linear;-moz-animation:spin 1s infinite linear;animation:spin 1s infinite linear}a.icon{cursor:pointer}.icon-controls .icon{display:none;float:right;text-align:left}table tr:hover .icon-controls .icon{display:block}.listing-filter .listing-filter__label{height:53px;line-height:53px}.listing-filter .listing-filter__select{min-width:150px}dl dt{clear:left;color:#888}dl dd{color:#333;margin-left:0}dl dt,dl dd{display:inline-block;float:left;line-height:37px;margin-bottom:10px !important;word-wrap:break-word}.list__tree{list-style:none;border-left:1px solid #d4d4d4;position:relative}.list__tree.list__tree--sub-level{margin-top:10px;margin-left:20px;clear:both}.list__tree.list__tree--sub-level .list__item .list__item-feedback{left:180px}.list__tree .list__item{list-style:none}.list__tree .list__item:before{content:'';width:12px;height:1px;background:#d4d4d4;display:inline-block;position:relative;top:-4px;margin-right:5px}.list__tree .list__item:last-child::after{content:'';width:4px;height:1em;position:absolute;display:block;left:-2px;bottom:-6px;background:#f8f8f8}.list__tree .list__item .list__item-feedback{position:relative;left:200px;margin-top:-24px}tags-input{outline:none}tags-input .host:focus{outline:none}tags-input .tags:focus,tags-input .tags.focused{outline:none}tags-input .tags .tag-list{margin:4px 0 0;padding:0;list-style-type:none;width:100%;float:left}tags-input .tags .tag-item{display:inline-block;float:left;font-family:Ubuntu,Arial,"libra sans",sans-serif;font-size:1em;font-weight:300;height:30px;line-height:30px;cursor:default;color:#000;padding-right:15px;position:relative;margin:0 11px 0 0}tags-input .tags .tag-item .remove-button{display:inline-block;width:12px;height:12px;text-indent:-999em;background:url("../img/icons/cross.svg") no-repeat;background-size:12px 12px;position:absolute;right:0;top:9px;cursor:pointer}tags-input .tags .tag-item .remove-button:hover{text-decoration:none}tags-input .tags .input{padding:7px 10px;width:100% !important;float:left;position:relative !important;left:0}tags-input .tags .input::-ms-clear{display:none}tags-input .autocomplete{float:left;width:100%}tags-input .autocomplete .suggestion-list{background:#FFF;padding:10px 8px;border:1px solid #D2D2D2;border-top:0;border-radius:0 0 2px 2px}tags-input .autocomplete .suggestion-list li:hover{background:#EEE;cursor:pointer}tags-input[disabled] .host:focus{outline:none}tags-input[disabled] .tags{cursor:default}tags-input[disabled] .tags .tag-item .remove-button{cursor:default}tags-input[disabled] .tags .input{cursor:default}.tag-link{margin-right:10px}.tag-link:last-of-type:after{content:''}.table__data tags-input .tags{margin-top:-10px}.table__data tags-input .tags input{margin-left:0;width:50% !important;float:left}.pagination{margin:10px 0;text-align:center}.pagination .inactive{color:#AEA79F}.pagination a,.pagination span{margin:0 5px}.search{position:relative;padding-bottom:20px}.search input[type='search']{-webkit-appearance:textfield}.search .search__input{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;list-style:none;background:#FFF;box-shadow:0 1px 1px rgba(0,0,0,0.1);width:100%;border:none;padding:10px !important;font-size:1em;max-height:none}.search .search__input::-webkit-input-placeholder{color:#888 !important}.search .search__input:-moz-placeholder{color:#888 !important}.search .search__input::-moz-placeholder{color:#888 !important}.search .search__input:-ms-input-placeholder{color:#888 !important}.search .search__input[disabled="disabled"]{background-color:#fff;opacity:.5;pointer-events:none}.search .search__input[disabled="disabled"]+.search__submit.close{pointer-events:none;opacity:.5}.search .search__submit{position:absolute;top:10px;right:15px;background-color:transparent;background-image:url("../img/search-icon.svg");background-repeat:no-repeat;text-indent:-999em;display:block;width:21px;height:20px;overflow:hidden;outline:none;padding:0;border:none}.search .search__submit:hover{background-color:transparent;background-image:url("../img/search-icon.svg")}.search .search__submit.close{background-image:url("../img/icons/cross.svg");background-size:21px;margin-top:2px}.search .search__submit.close:hover{background-image:url("../img/icons/cross.svg")}.u-margin{margin:20px}.u-margin--none{margin:none !important}.u-margin--tiny{margin:5px !important}.u-margin--small{margin:10px !important}.u-margin--large{margin:40px !important}.u-margin--huge{margin:80px !important}.u-margin--top{margin-top:20px !important}.u-margin--top-none{margin-top:none !important}.u-margin--top-tiny{margin-top:5px !important}.u-margin--top-small{margin-top:10px !important}.u-margin--top-large{margin-top:40px !important}.u-margin--top-huge{margin-top:80px !important}.u-margin--right{margin-right:20px !important}.u-margin--right-none{margin-right:none !important}.u-margin--right-tiny{margin-right:5px !important}.u-margin--right-small{margin-right:10px !important}.u-margin--right-large{margin-right:40px !important}.u-margin--right-huge{margin-right:80px !important}.u-margin--bottom{margin-bottom:20px !important}.u-margin--bottom-none{margin-bottom:none !important}.u-margin--bottom-tiny{margin-bottom:5px !important}.u-margin--bottom-small{margin-bottom:10px !important}.u-margin--bottom-large{margin-bottom:40px !important}.u-margin--bottom-huge{margin-bottom:80px !important}.u-margin--left{margin-left:20px !important}.u-margin--left-none{margin-left:none !important}.u-margin--left-tiny{margin-left:5px !important}.u-margin--left-small{margin-left:10px !important}.u-margin--left-large{margin-left:40px !important}.u-margin--left-huge{margin-left:80px !important}.u-padding{padding:20px}.u-padding--none{padding:none !important}.u-padding--tiny{padding:5px !important}.u-padding--small{padding:10px !important}.u-padding--large{padding:40px !important}.u-padding--huge{padding:80px !important}.u-padding--top{padding-top:20px !important}.u-padding--top-none{padding-top:none !important}.u-padding--top-tiny{padding-top:5px !important}.u-padding--top-small{padding-top:10px !important}.u-padding--top-large{padding-top:40px !important}.u-padding--top-huge{padding-top:80px !important}.u-padding--right{padding-right:20px !important}.u-padding--right-none{padding-right:none !important}.u-padding--right-tiny{padding-right:5px !important}.u-padding--right-small{padding-right:10px !important}.u-padding--right-large{padding-right:40px !important}.u-padding--right-huge{padding-right:80px !important}.u-padding--bottom{padding-bottom:20px !important}.u-padding--bottom-none{padding-bottom:none !important}.u-padding--bottom-tiny{padding-bottom:5px !important}.u-padding--bottom-small{padding-bottom:10px !important}.u-padding--bottom-large{padding-bottom:40px !important}.u-padding--bottom-huge{padding-bottom:80px !important}.u-padding--left{padding-left:20px !important}.u-padding--left-none{padding-left:none !important}.u-padding--left-tiny{padding-left:5px !important}.u-padding--left-small{padding-left:10px !important}.u-padding--left-large{padding-left:40px !important}.u-padding--left-huge{padding-left:80px !important}.spinner-col{width:10px}.spinner{float:left;margin:0 auto;text-indent:-9999em}.spinner.spin{background:url("../img/in_progress.png") no-repeat;background-size:16px 16px;width:16px;height:16px;-webkit-animation:spin 1s infinite linear;-moz-animation:spin 1s infinite linear;animation:spin 1s infinite linear;padding:0}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}table,.table{border-color:#d2d2d2;border-spacing:0;overflow-x:scroll;margin-bottom:20px;margin:0 0 2.5em;width:100%;text-align:left;border-collapse:separate}table tr,.table table tr,table .table tr,.table .table__row{width:100%;border-color:#b2b2b2;border-bottom-style:dotted;border-bottom-width:1px}table th,.table table th,table .table th,table td,.table table td,table .table td,.table .table__header,.table .table__data{font-size:1em;padding:10px;box-sizing:border-box;min-height:21px;background:none;border:0;text-align:left;border-collapse:separate;vertical-align:top;backface-visibility:hidden;position:relative}table thead tr,.table table thead tr,table thead .table tr,.table .table__head .table__row{color:#888;border-bottom:1px solid}table thead tr:hover,.table .table__head .table__row:hover{background-color:transparent}table thead th,.table table thead th,table thead .table th,.table .table__head .table__header{font-size:0.8125em;background:none;color:#888;font-size:13px}table thead th input[type="radio"]+label,.table .table__head .table__header input[type="radio"]+label,table thead th input[type="checkbox"]+label,.table .table__head .table__header input[type="checkbox"]+label{margin:0;top:-3px}table thead th a:link,table thead th a:visited,.table .table__head .table__header .table__header-link{color:#888}table thead th a:hover:link,table thead th a:hover:visited,.table .table__head .table__header .table__header-link:hover{color:#333;text-decoration:none;border-bottom:1px solid #333}table thead th a.active:link,table thead th a.active:visited,.table .table__head .table__header .active.table__header-link{color:#333;text-decoration:none}table thead th a.sort:link,table thead th a.sort:visited,.table .table__head .table__header .sort.table__header-link{border-bottom:1px solid #333}table thead .divide,.table .table__head .table__header-divide,.table .table__head .divide{width:1px;display:inline-block;background:#888;height:10px;margin:0 5px}table .numerical,.table .numerical{text-align:right}table input,.table input,table select,.table select{margin:0 0 0 -14px}table input[type="radio"]+label,.table input[type="radio"]+label,table input[type="checkbox"]+label,.table input[type="checkbox"]+label{margin:0;top:-1px}table th{color:#888;border-bottom:1px solid}table td{border-color:#b2b2b2;border-bottom-style:dotted;border-bottom-width:1px}table td a:link,table td a:visited{color:#333;border-bottom:1px solid #d2d2d2}table td a:link:hover,table td a:visited:hover{text-decoration:none;color:#dd4814}.table{display:table}.table .table__row{float:left;display:table-row}.table .table__row:hover{background-color:#fff}.table .table__row:hover .table__input{background-color:#fff;border-color:#d2d2d2;background-position:right 10px top 16px}.table .table__row:hover .table__input[disabled]{border-color:transparent}.table .table__row:hover .table__controls{z-index:1;opacity:1}.table .table__row:hover .table__controls--secondary{z-index:1;opacity:1}.table .table__row.active{background-color:#fff}.table .table__row.active .table__input{background-color:#fff;border-color:#d2d2d2;background-position:right 10px top 16px}.table .table__row.active .table__controls{z-index:1;opacity:1}.table .table__row.active .table__controls--secondary{z-index:1;opacity:1}.table .table__row.active .table__dropdown .table__row{display:none}.table .table__row.active .table__dropdown .table__row.active{display:block}.table .table__header,.table .table__data{display:table-cell;float:left}.table .table__data a:link,.table .table__data a:visited{color:#333;border-bottom:1px solid #d2d2d2}.table .table__data a:link:hover,.table .table__data a:visited:hover{text-decoration:none;color:#dd4814}.table .table__head{display:table-head;width:100%;box-sizing:border-box}.table .table__body{display:table-row-group}.table .table__footer{display:table-footer-group}.table .table__label{clear:both;display:block;margin-top:11px;color:#bcbcbc}.table .table__label a{color:#bcbcbc}.table .table__label a:hover{color:#dd4814}.table .table__label.active a{color:#dd4814}.table .table__controls{width:100%;text-align:right;opacity:0;z-index:-1000}.table .table__controls--secondary{opacity:0;z-index:-1000;width:auto;text-align:left}.table .table__controls a,.table .table__controls a:link,.table .table__controls a:visited{color:#333;border-bottom:1px solid #d2d2d2}.table .table__controls a:hover,.table .table__controls a:link:hover,.table .table__controls a:visited:hover{text-decoration:none;color:#dd4814}.table .table__input{display:inline-block;margin:-7px 0 -7px -14px;background-color:transparent;border-color:transparent;background-position:-9999px -9999px}.table .table__input[disabled]{background-color:transparent;border-color:transparent;pointer-events:none;background-position:-9999px -9999px;color:#333}.table .table__dropdown{width:100%}.table .table__dropdown .table__row{border-bottom:0;display:none;position:relative}.table .table__dropdown .table__row:before{display:block;margin:0 auto;width:calc(100% - 20px);border-top:1px dotted #d2d2d2;position:absolute;height:1px;content:'';top:0;left:10px}.table .table__dropdown .table__row.table__dropdown-row--head{border-bottom:0}.table .table__dropdown .table__row.table__dropdown-row--head .table__header{color:#bcbcbc;font-size:13px}.table .table__dropdown .table__row.no-border:before{display:none}.table .table__dropdown .table__row.border:before{display:block;margin:0 auto;width:calc(100% - 20px);border-top:1px dotted #d2d2d2;position:absolute;height:1px;content:'';top:0;left:10px}.table .table__dropdown .table__row.active .table__input{background-color:#fff;border-color:#d2d2d2;background-position:right 10px top 16px;pointer-events:all}.table .table__dropdown .table__row.active .table__input[disabled]{border-color:transparent;cursor:pointer}.table .table__dropdown--info .table__row{border-bottom:0}.table .table__dropdown--info .table__data{color:#bcbcbc}.form .form__group input,.form .form__group select{margin:0}.table--error{border-color:#d83832}.table--error .table__header,.table--error .table__data,.table--error th,.table--error td{border-color:#d83832;background-color:#f9dedd}.table--warning{border-color:#eca918}.table--warning .table__header,.table--warning .table__data,.table--warning th,.table--warning td{border-color:#eca918;background-color:#fcefd4}.table--success{border-color:#38b44a}.table--success .table__header,.table--success .table__data,.table--success th,.table--success td{border-color:#38b44a;background-color:#caeecf}.table--information{border-color:#2ab7ec}.table--information .table__header,.table--information .table__data,.table--information th,.table--information td{border-color:#2ab7ec;background-color:#e5f6fd}.table-col--1{width:1%}.table-col--2{width:2%}.table-col--3{width:3%}.table-col--4{width:4%}.table-col--5{width:5%}.table-col--6{width:6%}.table-col--7{width:7%}.table-col--8{width:8%}.table-col--9{width:9%}.table-col--10{width:10%}.table-col--11{width:11%}.table-col--12{width:12%}.table-col--13{width:13%}.table-col--14{width:14%}.table-col--15{width:15%}.table-col--16{width:16%}.table-col--17{width:17%}.table-col--18{width:18%}.table-col--19{width:19%}.table-col--20{width:20%}.table-col--21{width:21%}.table-col--22{width:22%}.table-col--23{width:23%}.table-col--24{width:24%}.table-col--25{width:25%}.table-col--26{width:26%}.table-col--27{width:27%}.table-col--28{width:28%}.table-col--29{width:29%}.table-col--30{width:30%}.table-col--31{width:31%}.table-col--32{width:32%}.table-col--33{width:33%}.table-col--34{width:34%}.table-col--35{width:35%}.table-col--36{width:36%}.table-col--37{width:37%}.table-col--38{width:38%}.table-col--39{width:39%}.table-col--40{width:40%}.table-col--41{width:41%}.table-col--42{width:42%}.table-col--43{width:43%}.table-col--44{width:44%}.table-col--45{width:45%}.table-col--46{width:46%}.table-col--47{width:47%}.table-col--48{width:48%}.table-col--49{width:49%}.table-col--50{width:50%}.table-col--51{width:51%}.table-col--52{width:52%}.table-col--53{width:53%}.table-col--54{width:54%}.table-col--55{width:55%}.table-col--56{width:56%}.table-col--57{width:57%}.table-col--58{width:58%}.table-col--59{width:59%}.table-col--60{width:60%}.table-col--61{width:61%}.table-col--62{width:62%}.table-col--63{width:63%}.table-col--64{width:64%}.table-col--65{width:65%}.table-col--66{width:66%}.table-col--67{width:67%}.table-col--68{width:68%}.table-col--69{width:69%}.table-col--70{width:70%}.table-col--71{width:71%}.table-col--72{width:72%}.table-col--73{width:73%}.table-col--74{width:74%}.table-col--75{width:75%}.table-col--76{width:76%}.table-col--77{width:77%}.table-col--78{width:78%}.table-col--79{width:79%}.table-col--80{width:80%}.table-col--81{width:81%}.table-col--82{width:82%}.table-col--83{width:83%}.table-col--84{width:84%}.table-col--85{width:85%}.table-col--86{width:86%}.table-col--87{width:87%}.table-col--88{width:88%}.table-col--89{width:89%}.table-col--90{width:90%}.table-col--91{width:91%}.table-col--92{width:92%}.table-col--93{width:93%}.table-col--94{width:94%}.table-col--95{width:95%}.table-col--96{width:96%}.table-col--97{width:97%}.table-col--98{width:98%}.table-col--99{width:99%}.table-col--100{width:100%}h1 span,h2 span,h3 span,h4 span,h5 span{color:#888;font-size:75%;padding-left:20px}h1{font-size:2em}h2{font-size:1.5em}h3{font-size:1.25em}h4{font-size:1em;font-weight:300}h5{font-size:0.875em}pre{border:0;background-color:#FFF;border-radius:2px}pre code{counter-reset:line-numbering}pre code .line{float:left}pre code .line::before{content:counter(line-numbering);counter-increment:line-numbering;padding-right:1em;width:1.5em;text-align:right;opacity:0.5;pointer-events:none;user-select:none}.yui3-node-add-widget{width:65.9292%;margin-right:2.21238%}@media screen and (max-width: 768px){.yui3-node-add-widget{width:100%;margin:0}}.yui3-node-add-widget .buttons{margin-top:30px}.yui3-node-add-widget .add-link img.icon{margin-right:6px}.yui3-overlay{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;background-color:#fff;-webkit-box-shadow:0 0 10px 0 rgba(0,0,0,0.5);box-shadow:0 0 10px 0 rgba(0,0,0,0.5)}.yui3-overlay ul{padding:5px 0}.yui3-overlay li{float:none}.yui3-overlay li:last-child a{border-bottom:none}.yui3-overlay a{display:block;padding:6px 20px;color:#dd4814 !important;border-bottom:1px solid #e5e2e0}.yui3-overlay a:focus,.yui3-overlay a:hover{background-color:#f2f2f2}.yui3-overlay-hidden{display:none}.yui3-widget-mask{background-color:#000;opacity:0.3}.yui3-panel{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;background-color:#FFF;padding:50px 80px 50px 80px;-webkit-box-shadow:0 0 15px 0 #000;box-shadow:0 0 15px 0 #000}.yui3-panel .yui3-button{float:right}.yui3-panel .yui3-button.link-button{float:left;padding-left:0;padding-right:0;color:#dd4814;border:none;background:none;-webkit-box-shadow:none;box-shadow:none;font-size:13px}.yui3-widget-hd{margin-bottom:30px;font-size:24px}.yui3-widget-ft{margin-top:50px}.yui3-widget-button-wrapper{width:100%}.color--success{color:#38B44A}.color--error{color:#D83832}.icon{margin-left:5px;width:16px;height:16px;display:inline-block;text-indent:-999em;background-repeat:no-repeat;background-size:16px 16px;vertical-align:middle;margin-top:-3px;position:relative;text-align:left;border-bottom:0 !important;padding:0}.icon:hover{border-bottom:0}.icon.info{background-image:url("../img/icons/info.png");background-image:url("../img/icons/info.svg"),none}.icon.help{background-image:url("../img/icons/help.png");background-image:url("../img/icons/help.svg"),none}.icon.edit{background-image:url("../img/icons/edit.png");background-image:url("../img/icons/edit.svg"),none}.icon.delete{background-image:url("../img/icons/delete.png");background-image:url("../img/icons/delete.svg"),none}.icon.remove{background-image:url("../img/icons/filter-remove.svg"),none}.icon.warning{background-image:url("../img/icons/warning.png");background-image:url("../img/icons/warning.svg"),none}.icon.debug{background-image:url("../img/icons/debug.png");background-image:url("../img/icons/debug.svg"),none}.icon.success,.icon.tick{background-image:url("../img/icons/success.png");background-image:url("../img/icons/success.svg"),none}.icon.simple-tick{background-image:url("../img/icons/green-tick.svg")}.icon.error{background-image:url("../img/icons/error.png");background-image:url("../img/icons/error.svg"),none}.icon.partition{background-image:url("../img/icons/partition.svg")}.icon.add{background-image:url("../img/icons/add.svg")}.icon.tags{background-image:url("../img/icons/tags.svg")}.icon.mount{background-image:url("../img/icons/mount.svg")}.icon.unmount{background-image:url("../img/icons/unmount.svg")}.icon.notification-error{background-image:url("../img/icons/notification-error.png");background-size:12px 11px;background-position:top 1px center}.icon.open{background-image:url("../img/icons/accordion-open.svg")}.icon.close{background-image:url("../img/icons/accordion-close.svg")}.clear{clear:both}.hidden{display:none}.align-right{text-align:right}.align-center{text-align:center}.align-left{text-align:left}.right{float:right !important}.left{float:left !important}.border{border-top:1px dotted #B2B2B2}.border.bottom{border-bottom:1px dotted #B2B2B2}.border.solid{border-style:solid}.vertical-align{position:relative;top:50%;-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)}.margin-top{margin-top:20px}.margin-top--five{margin-top:5px}.margin-top--ten{margin-top:10px}.margin-right{margin-right:20px !important}.margin-right--ten{margin-right:10px !important}.margin-bottom{margin-bottom:20px}.margin-bottom--ten{margin-bottom:10px !important}.margin-left{margin-left:20px !important}.margin-left--ten{margin-left:10px !important}.margin-left--thirty{margin-left:30px !important}.padding{padding:20px}.padding--ten{padding:10px}.padding-top{padding-top:20px}.padding-top--ten{padding-top:10px !important}.padding-right{padding-right:20px}.padding-right--ten{padding-right:10px}.padding-bottom{padding-bottom:20px !important}.padding-bottom--ten{padding-bottom:10px !important}.padding-left{padding-left:20px !important}.padding-left--ten{padding-left:10px}.padding-left--30,.padding-left--thirty{padding-left:30px !important}.padding-left--35{padding-left:35px !important}.padding-left--45{padding-left:45px !important}.padding-left--50{padding-left:50px !important}.border-top{border-top:1px dotted #888}.add-machine__list .add-machine__details,.border-bottom{border-bottom:1px dotted #888}.border--light{border-color:#d2d2d2}.no-margin{margin:0 !important}.no-margin-top{margin-top:0 !important}.no-padding{padding:0}.no-padding-top{padding-top:0 !important}.no-padding-left{padding-left:0}.no-padding-bottom{padding-bottom:0 !important}.no-margin-bottom{margin-bottom:0}.no-border--top{border-top:0 !important}.width--auto{width:auto}.width--half{width:50%}.width--full{width:100%}.box-sizing{box-sizing:border-box}.u-display--inline{display:inline}.u-display--inline-block{display:inline-block}.tooltip{position:relative}.tooltip::before{position:absolute;left:50%;-webkit-transform:translateX(-50%) translateY(-14px);-moz-transform:translateX(-50%) translateY(-14px);transform:translateX(-50%) translateY(-14px);content:'';width:0;height:0;border-left:5px solid transparent;border-right:5px solid transparent;z-index:-1;visibility:hidden;transition:opacity 0.2s ease-out;border-top:5px solid #333;opacity:0;bottom:100%;margin-bottom:-11px}.tooltip::after{content:attr(data-tooltip);font-size:13px;font-weight:400;line-height:16px;position:absolute;z-index:-1;visibility:hidden;left:50%;bottom:100%;-webkit-transform:translateX(-50%) translateY(-8px);-moz-transform:translateX(-50%) translateY(-8px);transform:translateX(-50%) translateY(-8px);background:#333;color:#FFF;padding:10px;height:auto;text-indent:0;opacity:0;transition:opacity 0.2s ease-out;border-radius:5px;box-shadow:0px 1px 3px 0 rgba(51,51,51,0.2);white-space:pre;box-sizing:border-box}.tooltip:hover::after,.tooltip:hover::before{opacity:1 !important;z-index:1000;visibility:visible}.tooltip.tooltip--right::before{border-top:5px solid transparent;border-right:5px solid #333;border-bottom:5px solid transparent;left:100%;bottom:inherit;top:50%;-webkit-transform:translateX(4px) translateY(-50%);-moz-transform:translateX(4px) translateY(-50%);transform:translateX(4px) translateY(-50%)}.tooltip.tooltip--right::after{left:100%;bottom:inherit;top:50%;margin-bottom:-14px;-webkit-transform:translateX(14px) translateY(-50%);-moz-transform:translateX(14px) translateY(-50%);transform:translateX(14px) translateY(-50%)}.footer-wrapper{border-top:1px dotted #b2b2b2}.footer-wrapper footer.global{background-color:transparent;padding-top:0px;padding-right:20px;padding-left:20px;background-image:url("../img/logos/logo-ubuntu-orange.png");background-image:url("../img/logos/logo-ubuntu-orange.svg"),none;background-size:107px 25px;background-position:top 20px right 20px;background-repeat:no-repeat;max-width:1480px}.footer-wrapper footer.global p{font-size:0.875em}.footer-wrapper footer.global a{margin:0 5px}.footer-wrapper footer.global .version{font-weight:500;margin-right:5px}.footer-wrapper footer.global .copy{margin-top:10px}.footer-wrapper footer.global .legal{max-width:1440px}.wrapper{min-height:100%;height:auto !important;height:100%;margin:0 auto -112px;position:relative;background:rgba(255,255,255,0.6);padding-top:172px}.wrapper:after{content:'';position:absolute;display:block;top:0;right:0;bottom:0;left:0;background:url("../img/backgrounds/image-background-paper.png");height:100%;width:100%;z-index:-1}.inner-wrapper{max-width:1480px;padding:0px 20px;margin:0 auto;position:relative}.push,.footer-wrapper{height:112px}.row{background-color:transparent;border-bottom:1px dotted #CCC}.row:last-child{border-bottom:none}@media only screen and (min-width: 768px){.equal-height{display:flex;flex-wrap:wrap;flex-direction:row;width:100%}.equal-height>.equal-height__item{box-sizing:border-box;display:flex;flex:auto;flex-direction:column}}header.banner{overflow:visible;z-index:20;position:fixed;top:0}header.banner .logo{padding-left:15px}header.banner .logo a{border-bottom:0}header.banner nav.nav-primary{border-bottom:none}header.banner .nav-primary.nav-right .logo-ubuntu{-moz-background-size:100px 30px;-webkit-background-size:100px 30px;-o-background-size:100px 30px;background-size:100px 30px;background-position:5px 9px;background-image:url("../img/logos/logo.png");background-image:url("../img/logos/logo.svg"),none}header.banner .nav-primary li:hover ul:after{display:none}@media screen and (max-width: 768px){header.banner .nav-primary ul{border-right:none}}header.banner #right-nav{float:right;margin-right:20px}@media screen and (max-width: 768px){header.banner #right-nav{margin-right:0}}header.banner #user-link{position:relative}@media screen and (max-width: 768px){header.banner #user-link{border-top:1px solid #d4d7d4;width:100%}}header.banner #user-link>a{padding-bottom:12px}@media screen and (max-width: 768px){header.banner #user-link>a{display:none}}header.banner #user-link .normal,header.banner #user-link .hover{margin-right:7px}@media screen and (max-width: 768px){header.banner #user-link .normal,header.banner #user-link .hover{display:none}}header.banner #user-link .hover{display:none}header.banner #user-link .nav{-webkit-border-radius:0px 0px 4px 4px;-moz-border-radius:0px 0px 4px 4px;border-radius:0px 0px 4px 4px;background-color:#FFF;border:none;display:none;position:absolute;right:0;top:48px;box-shadow:0px 2px 4px rgba(0,0,0,0.15)}@media screen and (min-width: 769px){header.banner #user-link .nav a.active{background:none;border:none}}header.banner #user-link .nav a:hover{background-color:transparent}@media screen and (max-width: 768px){header.banner #user-link .nav a:hover{background-color:#F8F8F8;color:#333}}@media screen and (max-width: 768px){header.banner #user-link .nav{background:none;position:relative;top:inherit;width:100%;box-shadow:none;float:left;padding:0}header.banner #user-link .nav li{border-bottom:1px solid #d4d7d4;width:100%;float:left}header.banner #user-link .nav li a{padding:10px 14px;width:100%}}@media screen and (max-width: 768px){header.banner #user-link:hover>a{background-color:transparent}}header.banner #user-link:hover .normal{display:none}header.banner #user-link:hover .hover{display:inline-block}@media screen and (max-width: 768px){header.banner #user-link:hover .hover{display:none}}header.banner #user-link:hover .nav{display:block}header.banner .nav-toggle{background-image:url("../img/icons/navigation-menu-plain.png");background-image:url("../img/icons/navigation-menu-plain.svg"),none;top:0}@media screen and (max-width: 768px){header.banner .nav-toggles .open{display:block}header.banner .nav-toggles .close{display:none}header.banner #canonlist:target ul{display:block}header.banner #canonlist:target+.nav-toggles .open{display:none}header.banner #canonlist:target+.nav-toggles .close{display:block}}.page-header{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;background:#FFF;box-shadow:0 1px 1px rgba(0,0,0,0.1);width:100%;float:left;position:fixed;z-index:10;top:48px;min-height:104px}.page-header .page-header__nav{position:absolute;top:10px;z-index:1000}.page-header .page-header__nav a{font-weight:300}.page-header .page-header__title{font-size:2em;width:auto;padding:31px 0;margin:0;float:left;font-size:32px}.page-header .page-header__title [contenteditable="true"]{padding:8px 10px;width:auto;box-sizing:border-box;border:1px solid transparent;margin:-10px 0 -10px -10px;border-radius:2px;color:#333;cursor:default;font-size:32px;display:inline-block}.page-header .page-header__title [contenteditable="true"].editmode,.page-header .page-header__title [contenteditable="true"].editable:hover{border:1px solid #D2D2D2;cursor:text}.page-header .page-header__title [contenteditable="true"].editmode:hover,.page-header .page-header__title [contenteditable="true"]:active,.page-header .page-header__title [contenteditable="true"]:focus{outline:none;background-color:#FFF;border:1px solid #B2B2B2}.page-header .page-header__title [contenteditable="true"].invalid,.page-header .page-header__title [contenteditable="true"].invalid:hover,.page-header .page-header__title [contenteditable="true"].invalid:active,.page-header .page-header__title [contenteditable="true"].invalid:focus{border-color:#d90000}.page-header .page-header__title [contenteditable="true"] br{display:none}.page-header .page-header__title .page-header__title-dot{display:inline-block;width:auto;padding:0}.page-header .page-header__title .page-header__title-domain{display:inline-block;width:auto;max-height:59px;line-height:25px;min-height:59px;background-position:top 27px right 10px;margin:-9px 0;font-size:32px}.page-header .page-header__title .icon{vertical-align:3px;margin-right:10px}.page-header .page-header__title .page-header__title--identicator{font-size:0.6em;width:auto;display:inline-block;position:relative;top:0px;padding-left:20px;margin-left:10px}.page-header .page-header__title .page-header__title--identicator a{color:#888;border-bottom:0}.page-header .page-header__title .page-header__title--identicator a:hover{text-decoration:none;border-bottom:3px solid #888}.page-header .page-header__title .page-header__title--identicator a:focus,.page-header .page-header__title .page-header__title--identicator a:active{text-decoration:none}.page-header .page-header__title .page-header__title--identicator a.active{color:#333;border-bottom:3px solid #dd4814}.page-header .page-header__title .page-header__title--identicator a.active:hover{text-decoration:none;cursor:default}.page-header .page-header__title .page-header__title--identicator .divide{width:1px;display:inline-block;background:#D2D2D2;height:11px;padding:0;margin:0 5px}.page-header .page-header__title .page-header__title--identicator .page-header__title-loadmore{font-size:14px;margin-left:10px}.page-header .page-header__title .page-header__title--identicator .page-header__title-loadmore:hover{border:0;text-decoration:underline}.page-header .page-header__title .link-cta-ubuntu,.page-header .page-header__title .alt{font-size:16px;margin-left:20px;position:relative;vertical-align:middle;margin-top:-5px}.page-header .page-header__actions{float:right;padding:34px 0;margin-bottom:0}.page-header .page-header__actions .page-header__cta{float:right;position:relative;height:auto;max-height:36px}.page-header .page-header__actions .page-header__cta .cta-group{float:right}.page-header .page-header__actions .page-header__cta .page-header__cta-feedback{display:inline-block;position:relative;line-height:36px;text-align:right;color:#dd4814;margin-right:20px;cursor:pointer}.page-header .page-header__actions .page-header__cta .page-header__cta-feedback:hover{text-decoration:underline}.page-header .page-header__dropdown{float:left;width:100%;max-height:1000px;transition:max-height 0.3s ease-in;overflow:hidden;border-color:#888 !important}.page-header .page-header__dropdown.ng-hide{display:block !important;max-height:0;overflow:hidden;transition:max-height 0.3s ease-out;border-top:none}.page-header .page-header__dropdown .page-header__feedback{border-top:1px dotted #888;display:block;float:left;width:100%;padding:20px 0}.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;background-position:top 3px left 0px;background-repeat:no-repeat;padding:6px 0 5px 25px;width:auto;display:inline-block;position:relative}.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.info,.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.error{background-image:url("../img/icons/error.png");background-image:url("../img/icons/error.svg"),none;background-position:0px 9px}.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.info.progress,.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.error.progress{width:100%}.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.warning{background-image:url("../img/icons/warning.png");background-image:url("../img/icons/warning.svg"),none;background-position:0px 9px}.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.progress{padding-left:0}.page-header .page-header__dropdown .page-header__feedback .page-header__feedback-message.progress .loader{position:relative;top:1px}.title .title__indicator .title__link{color:#888;font-size:20px}.title .title__indicator .title__link:hover{color:#333;text-decoration:none;border-bottom:1px solid #333}.title .title__indicator .title__link:focus,.title .title__indicator .title__link:active{text-decoration:none}.title .title__indicator .title__link.active{color:#333;border-bottom:1px #dd4814 solid}.title .title__indicator .divide{width:1px;display:inline-block;background:#D2D2D2;height:11px;padding:0;margin:0 5px}.accounts .logout .divide{padding:0 20px 0 30px;display:inline-block}.accounts .api li{position:relative}.accounts .api li input[type='text']{line-height:30px;padding-right:30px;width:100%}.accounts .api li input[type='text']::-webkit-input-placeholder{color:#333}.accounts .api li input[type='text']:-moz-placeholder{color:#333}.accounts .api li input[type='text']::-moz-placeholder{color:#333}.accounts .api li input[type='text']:-ms-input-placeholder{color:#333}.accounts .api li .delete-link{position:absolute;top:7px;right:7px}form.page-title-form{margin-bottom:30px}form.page-title-form input{-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid transparent;background-color:transparent;font-size:36px;line-height:26px;color:#333;margin:6px 10px;padding:4px;height:auto;box-shadow:none}form.page-title-form input:hover{outline:none;background:#FFF;border-color:#D2D2D2;box-shadow:inset 0 1px 1px rgba(0,0,0,0.1)}form.page-title-form input:focus{border:1px solid #dd4814;background-color:#fff;outline:none}.small-icon{width:12px}.images-info{text-align:center;padding:10px}.images-warning{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;list-style:none;padding:15px 20px 15px 45px;margin:0;font-weight:400;font-size:0.875em;background:#FFF;background-position:top 50% left 15px;background-repeat:no-repeat;margin:0 0 10px;box-shadow:0 1px 1px rgba(0,0,0,0.1);border:1px solid #EEE;background-image:url("../img/icons/warning.png");background-image:url("../img/icons/warning.svg"),none}#loader{width:10px;margin:16px auto 0 auto}#importing{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;list-style:none;padding:15px 20px 15px 45px;margin:0;font-weight:400;font-size:0.875em;background:#FFF;background-position:top 50% left 15px;background-repeat:no-repeat;margin:0 0 10px;box-shadow:0 1px 1px rgba(0,0,0,0.1);border:1px solid #EEE;position:relative}#importing .spinner{position:absolute;left:15px}.importing-dot{opacity:0;-webkit-animation:dot 1.3s infinite;animation:dot 1.3s infinite}.selector{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px;padding:20px;background:#FFF;margin:0 0 20px;box-shadow:0 1px 1px rgba(0,0,0,0.1);border:1px solid #EEE;width:100%;float:left}.selector h2{font-size:1em;font-weight:300}.selector h2 img{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:inline-block;background:url("../img/icons/help.svg") no-repeat;width:16px;height:16px;padding-left:16px;margin-left:5px}.selector .selector-available,.selector .selector-chosen{width:46%;float:left;margin:0;text-align:left}@media screen and (max-width: 768px){.selector .selector-available,.selector .selector-chosen{width:100%}}.selector .selector-available h2,.selector .selector-chosen h2{background:none;border:none}.selector .selector-available select,.selector .selector-chosen select{margin-bottom:10px}.selector ul.selector-chooser{width:8%;float:left;margin:20% 0 0}@media screen and (max-width: 768px){.selector ul.selector-chooser{width:100%;margin:0 0 10px;text-align:center}}.selector ul.selector-chooser li{width:100%;text-align:center}@media screen and (max-width: 768px){.selector ul.selector-chooser li{width:auto;display:inline-block;height:16px;width:16px;margin:0 20px}}.selector ul.selector-chooser li a{display:block;text-indent:999em;width:16px;height:16px;overflow:hidden;margin:0 auto}.selector ul.selector-chooser li a.selector-add{background-image:url("../img/icons/chevron_right.svg")}@media screen and (max-width: 768px){.selector ul.selector-chooser li a.selector-add{background-image:url("../img/icons/chevron_down.svg")}}.selector ul.selector-chooser li a.selector-remove{background-image:url("../img/icons/chevron_left.svg")}@media screen and (max-width: 768px){.selector ul.selector-chooser li a.selector-remove{background-image:url("../img/icons/chevron_up.svg")}}.selector .selector-filter img{display:none}.selector .selector-filter input{background-image:url("../img/search-orange.png");background-repeat:no-repeat;background-position:top 7px right 8px}.selector select#id_mac_addresses_to.filtered{height:269px !important}.nodes{position:relative}.nodes .search{position:absolute;right:0}.nodes .search input[type='submit']{position:absolute;top:8px;right:12px;background-color:transparent;background-image:url("../img/search-icon.svg");background-repeat:no-repeat;text-indent:-999em;display:block;width:21px;height:20px;overflow:hidden;outline:none;padding:0}.nodes .search input[type='submit']:hover{color:transparent;background-color:transparent;background-image:url("../img/search-icon.svg");background-repeat:no-repeat}@media screen and (max-width: 768px){.nodes .search{position:relative}}@media screen and (max-width: 768px){.nodes .actions select{width:100%;margin-bottom:20px}.nodes .actions input{position:absolute;right:0;top:0}}.powerstates{width:14px;height:15px;display:inline-block}.powerstates.power-on{background:transparent url("../img/icons/power-on.svg") left top no-repeat}.powerstates.power-off{background:transparent url("../img/icons/power-off.svg") left top no-repeat}.powerstates.power-unknown{background:none}.powerstates.power-error{background:transparent url("../img/icons/power-error.svg") left top no-repeat}.powerstates.power-check-ok{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;width:10px;height:10px;color:#33CC00}.powerstates.power-check-error{-webkit-border-radius:50%;-moz-border-radius:50%;border-radius:50%;width:10px;height:10px;color:#FF0000}.node-actions .link-cta-ubuntu,.node-actions .cta-ubuntu{margin-bottom:10px;float:left;font-size:16px}.buttons{margin-top:30px}#network-interfaces li{list-style-type:none}#content-discovery-data{padding-top:20px;margin-top:20px;border-top:1px dotted #B2B2B2}#content-discovery-data .slider{height:0;overflow:hidden}.slider{padding-top:0 !important}.slider .content{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;box-shadow:0 1px 1px rgba(0,0,0,0.1);background:#FFF;border:1px solid #EEE;border-top:none;padding:20px}.slider .content pre{margin:0}.slider .tabs{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;padding:8px 20px;margin:0;font-weight:400;font-size:0.875em;background:#FFF;background-position:top 50% left 15px;background-repeat:no-repeat;border:1px solid #EEE}.add-machine__list{padding:13px 0 20px;border-top:1px dotted #888;margin-bottom:0}.add-machine__list .add-machine__details{background:transparent url("../img/icons/accordion-open.svg") top 12px right 10px no-repeat}.add-machine__list .add-machine__details>div{margin-bottom:0}.add-machine__list .add-machine__details .add-machine__details-form{display:none}.add-machine__list .add-machine__details.active{background-image:url("../img/icons/accordion-close.svg")}.add-machine__list .add-machine__details.active .add-machine__details-form{display:block}.power-status{display:inline-block;font-size:100%;padding-left:0}.power-status--power{display:inline-block;margin-left:20px;position:relative;font-size:100%}.power-status--power.checking{color:#2AB7EC;background:url("../img/status_in_progress.svg");padding-left:20px}.power-status--power.on{padding-left:20px;color:#38B44A;background:transparent url("../img/icons/power-on.svg") left top 4px no-repeat}.power-status--power.off{padding-left:20px;color:#D2D2D2;background:transparent url("../img/icons/power-off.svg") left top 4px no-repeat}.power-status--power.error{padding-left:20px;color:#DB3832;background:transparent url("../img/icons/power-error.svg") left top 4px no-repeat}.power-status--power .power-check{font-size:0.75em;color:#D2D2D2;display:inline-block;padding:0}.power-status--power .power-check .power-check__link{color:#888;text-decoration:none;margin-left:5px}.power-status--power .power-check .power-check__link:hover{border-bottom:0 !important;text-decoration:underline !important}.loading,.loader{background:url("../img/in_progress.png") no-repeat;background-size:16px 16px;width:16px;height:16px;-webkit-animation:spin 1s infinite linear;-moz-animation:spin 1s infinite linear;animation:spin 1s infinite linear;padding:0;display:inline-block}.details__used{color:#BCBCBC}.details .details__label{clear:both;display:block;margin-top:11px;color:#BCBCBC}.details .details__label a{color:#BCBCBC}.details .details__label a:hover{color:#dd4814}.details .details__label.active a{color:#dd4814}.details .details__controls{width:100%;text-align:right;opacity:0;z-index:-1000}.details .details__controls--secondary{opacity:0;z-index:-1000;width:auto;text-align:left}.details .table-row .details__input{display:inline-block;margin:-7px 0 -8px -14px;background-color:transparent;border-color:transparent;background-position:-9999px -9999px}.details .table-row .details__text{line-height:37px}.details .table-row:hover .details__input{background-color:#FFF;border-color:#D2D2D2;background-position:right 10px top 16px}.details .table-row:hover .details__controls{z-index:1;opacity:1}.details .table-row:hover .details__controls--secondary{z-index:1;opacity:1}.details .table-row.active:hover .details__input{background-color:transparent;border-color:transparent;pointer-events:none;background-position:-9999px -9999px}.details .table-row.active:hover .details__controls{opacity:0;z-index:-1000;pointer-events:none}.details .table-row.active:hover .details__controls--secondary{z-index:-1000;opacity:0;pointer-events:none}.details .table-row label{font-size:13px;color:#BCBCBC}.details .table-row input,.details .table-row select{margin:0 0 0 -14px}.details .table-row input[type="radio"]{margin-left:0}.details .details__dropdown .details__row{border-bottom:0;position:relative}.details .details__dropdown .details__row:before{display:block;margin:0 auto;width:calc(100% - 20px);border-top:1px dotted #B2B2B2;position:relative;height:1px;content:''}.details .details__dropdown .details__row.details__row--head{border-bottom:0}.details .details__dropdown .details__row.details__row--head .table-cell{color:#BCBCBC;font-size:13px}.details .details__dropdown .details__row.no-border{border:0}.details .details__dropdown .details__row.no-border:before{border:0}.details .details__dropdown--info .table-row{border-bottom:0}.details .details__dropdown--info .table-cell{color:#BCBCBC}

=== modified file 'src/maasserver/static/js/angular/controllers/node_details_networking.js'
=== modified file 'src/maasserver/static/js/angular/controllers/node_details_storage.js'
=== modified file 'src/maasserver/static/js/angular/controllers/node_events.js'
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js'
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2016-10-12 16:34:23 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js	2016-10-26 23:39:26 +0000
@@ -2810,6 +2810,7 @@
             });
     });
 
+<<<<<<< TREE
     describe("getCannotCreateBcacheMsg", function() {
 
         it("returns msg if no cachesets",
@@ -3075,6 +3076,94 @@
 
     });
 
+=======
+    describe("getCannotCreateBcacheMsg", function() {
+
+        it("returns msg if no cachesets",
+            function() {
+                var controller = makeController();
+                $scope.available = [
+                    {
+                        fstype: null,
+                        $selected: true,
+                        has_partitions: false
+                    }
+                ];
+                $scope.cachesets = [];
+                expect($scope.getCannotCreateBcacheMsg()).toBe(
+                    "Create at least one cache set to create bcache");
+            });
+
+        it("returns msg if two selected", function() {
+            var controller = makeController();
+            $scope.cachesets = [{}];
+            $scope.available = [ { $selected: true }, { $selected: true }];
+            expect($scope.getCannotCreateBcacheMsg()).toBe(
+                "Select only one available device to create bcache");
+        });
+
+        it("returns msg if selected has fstype", function() {
+            var controller = makeController();
+            $scope.available = [
+                {
+                    fstype: "ext4",
+                    $selected: true,
+                    has_partitions: false
+                }
+            ];
+            $scope.cachesets = [{}];
+
+            expect($scope.getCannotCreateBcacheMsg()).toBe(
+                "Device is formatted; unformat the device to create bcache");
+        });
+
+        it("returns msg if selected is volume group", function() {
+            var controller = makeController();
+            $scope.available = [
+                {
+                    type: "lvm-vg",
+                    fstype: null,
+                    $selected: true,
+                    has_partitions: false
+                }
+            ];
+            $scope.cachesets = [{}];
+            expect($scope.getCannotCreateBcacheMsg()).toBe(
+                "Cannot use a logical volume as a backing device for bcache.");
+        });
+
+        it("returns msg if selected has partitions", function() {
+            var controller = makeController();
+            $scope.available = [
+                {
+                    fstype: null,
+                    $selected: true,
+                    has_partitions: true
+                }
+            ];
+            $scope.cachesets = [{}];
+            expect($scope.getCannotCreateBcacheMsg()).toBe(
+                "Device has already been partitioned; create a " +
+                "new partition to use as the bcache backing " +
+                "device");
+        });
+
+        it("returns null if selected is valid",
+            function() {
+                var controller = makeController();
+                $scope.available = [
+                    {
+                        fstype: null,
+                        $selected: true,
+                        has_partitions: false
+                    }
+                ];
+                $scope.cachesets = [{}];
+                expect($scope.getCannotCreateBcacheMsg()).toBeNull();
+            });
+    });
+
+>>>>>>> MERGE-SOURCE
     describe("canCreateBcache", function() {
 
         it("returns false when isAvailableDisabled is true", function() {

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_events.js'
=== modified file 'src/maasserver/static/js/angular/directives/controller_image_status.js'
=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2016-10-26 13:53:50 +0000
+++ src/maasserver/static/partials/node-details.html	2016-10-26 23:39:26 +0000
@@ -1941,9 +1941,15 @@
                         data-ng-disabled="!canCreateCacheSet()"
                         data-ng-hide="isAllStorageDisabled() || !isSuperUser()"
                         data-ng-click="createCacheSet()">Create cache Set</a>
+<<<<<<< TREE
                     <a class="button--secondary button--inline tooltip"
                         aria-label="{$ getCannotCreateBcacheMsg() $}"
                         data-ng-class="{ tooltip: !canCreateBcache() }"
+=======
+                    <a class="link-cta-ubuntu secondary margin-right"
+                        data-tooltip="{$ getCannotCreateBcacheMsg() $}"
+                        data-ng-class="{ tooltip: !canCreateBcache() }"
+>>>>>>> MERGE-SOURCE
                         data-ng-disabled="!canCreateBcache()"
                         data-ng-hide="isAllStorageDisabled() || !isSuperUser()"
                         data-ng-click="createBcache()">Create bcache</a>

=== modified file 'src/maasserver/static/partials/node-events.html'
--- src/maasserver/static/partials/node-events.html	2016-08-25 20:45:36 +0000
+++ src/maasserver/static/partials/node-events.html	2016-10-26 23:39:26 +0000
@@ -6,6 +6,7 @@
     </header>
 </div>
 <div class="ng-hide" data-ng-show="loaded">
+<<<<<<< TREE
     <header class="page-header u-margin--bottom">
         <div class="wrapper--inner">
             <h1 class="page-header__title">{$ node.fqdn $}</h1>
@@ -15,6 +16,19 @@
             </p>
             <div class="page-header__controls u-float--right">
                 <a class="button--base button--inline" href="#/node/{$ node.system_id $}">&lsaquo;&nbsp;Back to machine details</a>
+=======
+    <header class="page-header margin-bottom">
+        <div class="inner-wrapper">
+            <h1 class="page-header__title eight-col">
+                {$ node.fqdn $}
+                <span class="page-header__title--identicator">
+                    {$ events.length $} machine events in the past {$ days $} day(s)
+                    <a href="" class="page-header__title-loadmore" data-ng-click="loadMore()">load 1 more day</a>
+                </span>
+            </h1>
+            <div class="page-header__actions four-col last-col">
+                <a class="right link-cta-ubuntu text-button" href="#/node/{$ node.system_id $}">&lsaquo;&nbsp;Back to machine details</a>
+>>>>>>> MERGE-SOURCE
             </div>
         </div>
     </header>

=== modified file 'src/maasserver/static/partials/nodes-list.html'
--- src/maasserver/static/partials/nodes-list.html	2016-10-26 13:53:50 +0000
+++ src/maasserver/static/partials/nodes-list.html	2016-10-26 23:39:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 <header class="page-header">
     <div class="wrapper--inner">
         <!-- XXX ricgard 2016-06-16 - Need to add e2e test. -->
@@ -237,6 +238,178 @@
                         </div>
                         <div class="form__group">
                             <label for="zone" class="form__group-label two-col">Zone</label>
+=======
+<header class="page-header margin-bottom" data-maas-sticky-header>
+    <div class="inner-wrapper">
+        <h1 class="page-header__title eight-col">{$ $parent.site $} MAAS
+            <span class="page-header__title--identicator" id="bulk-actions">
+                <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                <a href=""
+                    class="tooltip"
+                    data-tooltip="A deployable node managed by MAAS."
+                    data-ng-class="{ active: currentpage === 'nodes' }"
+                    data-ng-click="toggleTab('nodes')">{$ nodes.length $} <ng-pluralize count="nodes.length" when="{'one': 'Machine', 'other': 'Machines'}"></ng-pluralize></a>
+                <span class="divide"></span>
+                <a href=""
+                    class="tooltip"
+                    data-tooltip="A node known to MAAS, but is not deployable."
+                    data-ng-class="{ active: currentpage === 'devices' }"
+                    data-ng-click="toggleTab('devices')">{$ devices.length $} <ng-pluralize count="devices.length" when="{'one': 'Device', 'other': 'Devices'}"></ng-pluralize>
+                </a>
+                <span data-ng-show="isSuperUser()" class="divide"></span>
+                <a href="" data-ng-show="isSuperUser()"
+                    class="tooltip"
+                    data-tooltip="A node that provides MAAS services."
+                    data-ng-class="{ active: currentpage === 'controllers' }"
+                    data-ng-click="toggleTab('controllers')">{$ controllers.length $} <ng-pluralize count="controllers.length" when="{'one': 'Controller', 'other': 'Controllers'}"></ng-pluralize>
+                </a>
+                <span class="power-status--power" data-ng-show="loading">
+                    <span class="loader"></span>
+                    Loading...
+                </span>
+            </span>
+        </h1>
+        <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+        <div data-ng-show="currentpage === 'nodes'">
+            <div class="page-header__actions">
+                <div class="page-header__cta" data-ng-hide="tabs.nodes.selectedItems.length">
+                    <div class="right" data-maas-cta="addHardwareOptions"
+                        data-ng-model="addHardwareOption"
+                        data-ng-change="addHardwareOptionChanged()" data-default-title="Add hardware">
+                    </div>
+                </div>
+                <div class="page-header__cta ng-hide" data-ng-show="tabs.nodes.selectedItems.length">
+                    <span class="page-header__cta-feedback" data-ng-click="showSelected('nodes')">
+                        {$ tabs.nodes.selectedItems.length $} Selected
+                    </span>
+                    <div data-maas-cta="tabs.nodes.takeActionOptions"
+                        data-ng-model="tabs.nodes.actionOption"
+                        data-ng-change="actionOptionSelected('nodes')">
+                    </div>
+                </div>
+            </div>
+            <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+            <div class="page-header__dropdown ng-hide" data-ng-show="tabs.nodes.actionOption">
+                <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                <div class="page-header__feedback ng-hide" data-ng-hide="isActionError('nodes') || hasActionsInProgress('nodes')">
+                    <form class="form form--inline">
+                        <div class="nine-col no-margin-bottom ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'commission'">
+                            <div class="form__group u-margin--right u-margin--top-tiny">
+                                <input class="checkbox margin-right" id="enableSSH" type="checkbox"
+                                    data-ng-model="tabs.nodes.commissionOptions.enableSSH">
+                                <label class="checkbox-label" for="enableSSH">Allow SSH access and prevent machine from powering off</label>
+                            </div>
+                            <div class="form__group u-margin--right u-margin--top-tiny">
+                                <input class="checkbox margin-right" id="skipNetworking" type="checkbox"
+                                    data-ng-model="tabs.nodes.commissionOptions.skipNetworking">
+                                <label class="checkbox-label" for="skipNetworking">Retain network configuration</label>
+                            </div>
+                            <div class="form__group u-margin--top-tiny">
+                                <input class="checkbox" id="skipStorage" type="checkbox"
+                                    data-ng-model="tabs.nodes.commissionOptions.skipStorage">
+                                <label class="checkbox-label" for="skipStorage">Retain storage configuration</label>
+                            </div>
+                        </div>
+                        <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'deploy'">
+                            <label for="image" class="u-margin--right">Choose your image</label>
+                            <span data-maas-os-select="osinfo" data-ng-model="tabs.nodes.osSelection"></span>
+                        </span>
+                        <!-- XXX rbanffy 2015-03-23 - Need to add e2e test. -->
+                        <span class="form__group ng-hide" data-ng-show="tabs.nodes.actionOption.name === 'set-zone'">
+                            <label for="zone" class="u-margin--right">Select Zone</label>
+                            <select name="zone" id="zone" placeholder="Choose a zone"
+                                data-ng-model="tabs.nodes.zoneSelection"
+                                data-ng-options="zone as zone.name for zone in zones">
+                                <option value="" disabled="disabled">Choose a zone</option>
+                            </select>
+                        </span>
+                        <div class="right">
+                            <a href="" class="link-cta-ubuntu text-button" data-ng-click="actionCancel('nodes')">Cancel</a>
+                            <button class="cta-ubuntu" data-ng-click="actionGo('nodes')" data-ng-hide="hasActionsFailed('nodes')">Go</button>
+                            <button class="cta-ubuntu" data-ng-click="actionGo('nodes')" data-ng-show="hasActionsFailed('nodes')">Retry</button>
+                        </div>
+                    </form>
+                </div>
+
+                <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                <div class="page-header__feedback ng-hide" data-ng-show="isActionError('nodes')">
+                    <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                    <p class="page-header__feedback-message info" data-ng-hide="isDeployError('nodes') || isSSHKeyError('nodes')">
+                        {$ tabs.nodes.actionErrorCount $}
+                        <span data-ng-pluralize count="tabs.nodes.selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                        cannot be {$ tabs.nodes.actionOption.sentence $}. To proceed, update your selection.
+                    </p>
+                    <!-- XXX blake_r 2015-02-19 - Need to add e2e test. -->
+                    <p class="page-header__feedback-message info ng-hide" data-ng-show="isDeployError('nodes')">
+                        {$ tabs.nodes.selectedItems.length $}
+                        <span data-ng-pluralize count="tabs.nodes.selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                        cannot be {$ tabs.nodes.actionOption.sentence $}, because the required boot images have not been imported. To import boot images, visit the <a href="images/">images page</a>.
+                    </p>
+                    <p class="page-header__feedback-message info ng-hide" data-ng-show="isSSHKeyError('nodes')">
+                        {$ tabs.nodes.selectedItems.length $}
+                        <span data-ng-pluralize count="tabs.nodes.selectedItems.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                        cannot be {$ tabs.nodes.actionOption.sentence $}, because an SSH key has not been added to your account. To add an SSH key, visit <a href="account/prefs/">your account page</a>.
+                    </p>
+                </div>
+
+                <!-- XXX blake_r 2015-05-07 - Need to add e2e test. -->
+                <div class="page-header__feedback ng-hide" data-ng-show="hasActionsInProgress('nodes') || hasActionsFailed('nodes')">
+                    <p class="page-header__feedback-message progress" data-ng-show="hasActionsInProgress('nodes')">
+                        <span class="loader"></span>
+                        {$ tabs.nodes.actionProgress.completed $} of {$ tabs.nodes.actionProgress.total $}
+                        nodes have been {$ tabs.nodes.actionOption.sentence $}.
+                    </p>
+                    <p class="page-header__feedback-message error"
+                        data-ng-repeat="(error, nodes) in tabs.nodes.actionProgress.errors">
+                        The {$ tabs.nodes.actionOption.title.toLowerCase() $} action for {$ nodes.length $}
+                        <span data-ng-pluralize count="nodes.length" when="{'one': 'node', 'other': 'nodes'}"></span>
+                        failed with error: {$ error $}
+                    </p>
+                </div>
+            </div>
+            <div class="page-header__dropdown border ng-hide" data-ng-show="addHardwareScope.viewable" data-ng-controller="AddHardwareController">
+                <h3 class="u-padding--top" data-ng-if="showMachine()">Add machine</h3>
+                <h3 class="u-padding--top" data-ng-if="showChassis()">Add chassis</h3>
+                <div class="page-header__feedback" data-ng-hide="architectures.length">
+                    <!-- XXX blake_r 2015-02-24 - Need to add e2e test. -->
+                    <p class="page-header__feedback-message info">
+                        Cannot add {$ mode $} until boot images have been imported. To fix, visit the <a href="images">images page</a>.
+                    </p>
+                </div>
+                <form class="twelve-col ng-hide"  data-ng-show="showMachine()">
+                    <fieldset class="six-col no-padding no-margin-bottom">
+                        <div class="inline">
+                            <label for="machine-name" class="two-col">Machine name</label>
+                            <input type="text" id="machine-name" class="three-col" placeholder="Choose a machine name (optional)"
+                                data-ng-model="machine.name">
+                        </div>
+                        <div class="inline">
+                            <label for="domain" class="two-col">Domain</label>
+                            <select name="domain" id="domain" class="three-col"
+                                data-ng-model="machine.domain"
+                                data-ng-options="domain as domain.name for domain in domains">
+                                <option value="" disabled>Choose a domain</option>
+                            </select>
+                        </div>
+                        <div class="inline">
+                            <label for="architecture" class="two-col">Architecture</label>
+                            <select name="architecture" id="architecture" class="three-col"
+                                data-ng-model="machine.architecture"
+                                data-ng-options="arch for arch in architectures">
+                                <option value="" disabled>Choose an architecture</option>
+                            </select>
+                        </div>
+                        <div class="inline">
+                            <label for="min_hwe_kernel" class="two-col">Minimum Kernel</label>
+                            <select name="min_hwe_kernel" id="min_hwe_kernel" class="three-col" placeholder="No minimum kernel"
+                                data-ng-model="machine.min_hwe_kernel"
+                                data-ng-options="hwe_kernel[0] as hwe_kernel[1] for hwe_kernel in hwe_kernels">
+                                <option value="">No minimum kernel</option>
+                            </select>
+                        </div>
+                        <div class="inline">
+                            <label for="zone" class="two-col">Zone</label>
+>>>>>>> MERGE-SOURCE
                             <select name="zone" id="zone" class="three-col" placeholder="Choose a zone"
                                 data-ng-model="machine.zone"
                                 data-ng-options="zone as zone.name for zone in zones">

=== added directory 'src/maasserver/static/scss/maas'
=== added directory 'src/maasserver/static/scss/maas/components'
=== added file 'src/maasserver/static/scss/maas/components/_accordion.scss.OTHER'
--- src/maasserver/static/scss/maas/components/_accordion.scss.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/static/scss/maas/components/_accordion.scss.OTHER	2016-10-26 23:39:26 +0000
@@ -0,0 +1,112 @@
+@charset "UTF-8";
+
+////
+/// MAAS accordion styles
+///
+/// @project     MAAS
+/// @author      Web Team at Canonical Ltd
+/// @copyright   2015 Canonical Ltd
+///
+////
+
+.accordion {
+    @include box-sizing();
+    @include rounded-corners(2px);
+    list-style: none;
+    background:#FFF;
+    box-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+    margin-bottom: 40px;
+
+    .disabled & {
+        opacity: .5;
+        pointer-events: none;
+    }
+
+    // accordion main sidebar title
+    .accordion__title {
+        border-bottom: 1px dotted #B2B2B2;
+        padding: 13px 20px 12px;
+        margin: 0;
+        font-size: 1.3em;
+    }
+
+    // accordion data block, contains all filter links and controls.
+    .accordion__tab {
+        border-bottom: 1px dotted #B2B2B2;
+
+        &:last-of-type {
+            border: none;
+        }
+
+        // Block level title
+        .accordion__tab-title {
+            padding: 12px 20px;
+            margin: 0;
+            color: #888;
+            cursor: pointer;
+            background: transparent url('../img/icons/accordion-open.svg') top 20px right 20px no-repeat;
+
+            &.active {
+                background-image: url('../img/icons/accordion-close.svg');
+
+                + .accordion__tab-content {
+                    max-height: 400px;
+                    transition: max-height .5s ease-in;
+                    overflow-y: auto;
+                }
+            }
+        }
+
+        // Filter list
+        .accordion__tab-content {
+            max-height: 0;
+            transition: max-height .5s ease-out;
+            overflow: hidden;
+
+            .accordion__tab-list {
+                list-style-type: none;
+                padding: 0 20px 14px;
+                margin: 0;
+
+                .accordion__tab-item {
+                    margin-bottom: 0.15em;
+
+                    .accordion__tab-link {
+                        @include box-sizing();
+                        color: #333;
+                        width: 100%;
+                        display: inline-block;
+                        padding-right: 20px;
+                        border-bottom: 0;
+
+                        &:hover {
+                            color: $ubuntu-orange;
+                            text-decoration: none;
+                        }
+
+                        .disabled & {
+                            color: #333;
+                        }
+                    }
+
+                    &.active {
+                        font-weight: 400;
+
+                        .accordion__tab-link {
+                            background: transparent url('../img/icons/cross.svg') top 7px right 0px no-repeat;
+                        }
+
+                        &:hover {
+                            color: $ubuntu-orange;
+
+                            .accordion__tab-link {
+                                color: $ubuntu-orange;
+                                background-image: url('../img/icons/cross-orange.svg');
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== modified file 'src/maasserver/templates/maasserver/base.html'
--- src/maasserver/templates/maasserver/base.html	2016-10-05 15:01:48 +0000
+++ src/maasserver/templates/maasserver/base.html	2016-10-26 23:39:26 +0000
@@ -196,6 +196,7 @@
             <div class="twelve-col">
                 <div class="eight-col">
                     {% block footer-copyright %}
+<<<<<<< TREE
                     <p>
                         <small>
                             <strong class="u-margin--right">MAAS Version {{version}}</strong>&nbsp;<a href="http://maas.ubuntu.com/{{doc_version}}/changelog.html#id1">View release notes</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://maas.ubuntu.com/{{doc_version}}/">View documentation</a>
@@ -206,6 +207,12 @@
                             &copy; 2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.
                         </small>
                     </p>
+=======
+                    <p class="twelve-col">
+                        <span class="version">MAAS Version {{version}}</span> <a href="http://maas.ubuntu.com/{{doc_version}}/changelog.html#id1">View release notes</a>|<a href="http://maas.io/docs">View documentation</a>
+                    </p>
+                    <p class="twelve-col copy">&copy; 2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
+>>>>>>> MERGE-SOURCE
                     {% endblock %}
                 </div>
                 <div class="four-col last-col">

=== modified file 'src/maasserver/templates/maasserver/index.html'
--- src/maasserver/templates/maasserver/index.html	2016-10-05 15:01:48 +0000
+++ src/maasserver/templates/maasserver/index.html	2016-10-26 23:39:26 +0000
@@ -146,6 +146,7 @@
                         <li{% if message.tags %} class="flash-messages__item flash-messages__item--{{ message.tags }}" {% endif %}>{{ message }}</li>
                     {% endfor %}
                 {% endif %}
+<<<<<<< TREE
             </ul>
         </div>
         {% endif %}
@@ -231,5 +232,25 @@
             </div>
         </div>
     </footer>
+=======
+                <div id="content" data-ng-view>
+                </div>
+            </div>
+            <div class="push"></div>
+        </main>
+    </div>
+    <div class="footer-wrapper" data-maas-error-toggle>
+        <footer class="global inner-wrapper clearfix">
+            <div class="legal clearfix">
+                <div class="legal-inner">
+                    <p class="twelve-col">
+                        <span class="version">MAAS Version {{version}}</span> <a href="http://maas.ubuntu.com/{{doc_version}}/changelog.html#id1">View release notes</a>|<a href="http://maas.io/docs">View documentation</a>
+                    </p>
+                    <p class="twelve-col copy">&copy; 2016 Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
+                </div>
+            </div>
+        </footer>
+    </div>
+>>>>>>> MERGE-SOURCE
 </body>
 </html>

=== modified file 'src/maasserver/templates/maasserver/prefs.html'
--- src/maasserver/templates/maasserver/prefs.html	2016-10-13 13:13:12 +0000
+++ src/maasserver/templates/maasserver/prefs.html	2016-10-26 23:39:26 +0000
@@ -29,8 +29,13 @@
                 <ul class="no-bullets">
                     {% for token in user.userprofile.get_authorisation_tokens %}
                     <li class="bundle">
+<<<<<<< TREE
                         <a href="#" class="delete-link icon right">
                             <img title="Delete MAAS key" class="left" src="{{ STATIC_URL }}assets/images/icons/delete.png" />
+=======
+                        <a href="#" class="u-margin--top-tiny delete-link icon right">
+                            <img title="Delete MAAS key" class="left" src="{{ STATIC_URL }}img/delete.png" />
+>>>>>>> MERGE-SOURCE
                         </a>
                         <input type="text" value="{{ token.consumer.key }}:{{ token.key }}:{{ token.secret }}" id="{{ token.key }}" class="disabled" />
                     </li>

=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2016-10-24 19:12:33 +0000
+++ src/maasserver/testing/factory.py	2016-10-26 23:39:26 +0000
@@ -441,9 +441,14 @@
                 ip_address = existing_static_ips[0]
             bmc_ip_address = self.pick_ip_in_Subnet(ip_address.subnet)
             node.power_parameters = {
+<<<<<<< TREE
                 "power_address": "qemu+ssh://user@%s/system" % (
                     factory.ip_to_url_format(bmc_ip_address)),
                 "power_id": factory.make_name("power_id"),
+=======
+                "power_address": "qemu+ssh://user@%s/system" % bmc_ip_address,
+                "power_id": factory.make_name("power_id"),
+>>>>>>> MERGE-SOURCE
             }
             node.save()
 

=== modified file 'src/maasserver/tests/test_bootresources.py'
--- src/maasserver/tests/test_bootresources.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/tests/test_bootresources.py	2016-10-26 23:39:26 +0000
@@ -932,6 +932,7 @@
         with rfile.largefile.content.open('rb') as stream:
             written_data = stream.read()
         self.assertEqual(content, written_data)
+<<<<<<< TREE
         rfile.largefile = reload_object(rfile.largefile)
         self.assertEqual(rfile.largefile.size, len(written_data))
         self.assertEqual(rfile.largefile.size, rfile.largefile.total_size)
@@ -948,6 +949,11 @@
         self.assertEqual(b'', written_data)
         rfile.largefile = reload_object(rfile.largefile)
         self.assertEqual(rfile.largefile.size, 0)
+=======
+        rfile.largefile = reload_object(rfile.largefile)
+        self.assertEqual(rfile.largefile.size, len(written_data))
+        self.assertEqual(rfile.largefile.size, rfile.largefile.total_size)
+>>>>>>> MERGE-SOURCE
 
     @skip(
         "XXX blake_r: Skipped because it causes the test that runs after this "
@@ -2098,6 +2104,7 @@
         response = {"images": [make_rpc_boot_image()]}
         cluster_rpc.ListBootImages.return_value = succeed(response)
         self.assertTrue(service.are_boot_images_available_in_any_rack())
+<<<<<<< TREE
 
 
 class TestBootResourceRepoWriter(MAASServerTestCase):
@@ -2335,3 +2342,104 @@
         mock_insert = self.patch(boot_resource_repo_writer.store, 'insert')
         boot_resource_repo_writer.insert_item(data, src, None, pedigree, None)
         self.assertThat(mock_insert, MockNotCalled())
+=======
+
+
+class TestBootResourceRepoWriter(MAASServerTestCase):
+    """Tests for `BootResourceRepoWriter`."""
+
+    def create_simplestream(self, ftypes):
+        version = '16.04'
+        arch = 'amd64'
+        subarch = 'hwe-x'
+        product = "com.ubuntu.maas.daily:v2:boot:%s:%s:%s" % (
+            version, arch, subarch)
+        version = datetime.now().date().strftime('%Y%m%d.0')
+        versions = {
+            version: {
+                'items': {
+                    ftype: {
+                        'sha256': factory.make_name('sha256'),
+                        'path': factory.make_name('path'),
+                        'ftype': ftype,
+                        'size': random.randint(0, 2**64),
+                    } for ftype in ftypes
+                }
+            }
+        }
+        products = {
+            product: {
+                'krel': 'xenial',
+                'subarch': subarch,
+                'label': 'daily',
+                'os': 'ubuntu',
+                'arch': arch,
+                'subarches': 'generic,%s' % subarch,
+                'kflavor': 'generic',
+                'version': version,
+                'versions': versions,
+            }
+        }
+        src = {
+            'datatype': 'image-downloads',
+            'format': 'products:1.0',
+            'updated': format_datetime(datetime.now()),
+            'products': products,
+            'content_id': 'com.ubuntu.maas:daily:v2:download'
+        }
+        return src, product, version
+
+    def test_insert_prefers_squashfs_over_root_image(self):
+        boot_resource_repo_writer = BootResourceRepoWriter(
+            BootResourceStore(), None)
+        src, product, version = self.create_simplestream([
+            BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE,
+            BOOT_RESOURCE_FILE_TYPE.SQUASHFS_IMAGE,
+        ])
+        data = src['products'][product]['versions'][version]['items'][
+            BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE]
+        pedigree = (product, version, BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE)
+        mock_insert = self.patch(boot_resource_repo_writer.store, 'insert')
+        boot_resource_repo_writer.insert_item(data, src, None, pedigree, None)
+        self.assertThat(mock_insert, MockNotCalled())
+
+    def test_insert_allows_squashfs(self):
+        boot_resource_repo_writer = BootResourceRepoWriter(
+            BootResourceStore(), None)
+        src, product, version = self.create_simplestream([
+            BOOT_RESOURCE_FILE_TYPE.SQUASHFS_IMAGE,
+        ])
+        data = src['products'][product]['versions'][version]['items'][
+            BOOT_RESOURCE_FILE_TYPE.SQUASHFS_IMAGE]
+        pedigree = (product, version, BOOT_RESOURCE_FILE_TYPE.SQUASHFS_IMAGE)
+        mock_insert = self.patch(boot_resource_repo_writer.store, 'insert')
+        boot_resource_repo_writer.insert_item(data, src, None, pedigree, None)
+        self.assertThat(mock_insert, MockCalledOnce())
+
+    def test_insert_allows_root_image(self):
+        boot_resource_repo_writer = BootResourceRepoWriter(
+            BootResourceStore(), None)
+        src, product, version = self.create_simplestream([
+            BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE,
+        ])
+        data = src['products'][product]['versions'][version]['items'][
+            BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE]
+        pedigree = (product, version, BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE)
+        mock_insert = self.patch(boot_resource_repo_writer.store, 'insert')
+        boot_resource_repo_writer.insert_item(data, src, None, pedigree, None)
+        self.assertThat(mock_insert, MockCalledOnce())
+
+    def test_insert_ignores_unknown_ftypes(self):
+        boot_resource_repo_writer = BootResourceRepoWriter(
+            BootResourceStore(), None)
+        unknown_ftype = factory.make_name('ftype')
+        src, product, version = self.create_simplestream([
+            unknown_ftype,
+        ])
+        data = src['products'][product]['versions'][version]['items'][
+            unknown_ftype]
+        pedigree = (product, version, unknown_ftype)
+        mock_insert = self.patch(boot_resource_repo_writer.store, 'insert')
+        boot_resource_repo_writer.insert_item(data, src, None, pedigree, None)
+        self.assertThat(mock_insert, MockNotCalled())
+>>>>>>> MERGE-SOURCE

=== modified file 'src/maasserver/tests/test_config_forms.py'
=== modified file 'src/maasserver/tests/test_dhcp.py'
--- src/maasserver/tests/test_dhcp.py	2016-09-30 18:18:11 +0000
+++ src/maasserver/tests/test_dhcp.py	2016-10-26 23:39:26 +0000
@@ -736,6 +736,7 @@
                 'dhcp_snippets',
                 ]))
 
+<<<<<<< TREE
     def test__sets_ipv4_dns_from_arguments(self):
         rack_controller = factory.make_RackController(interface=False)
         vlan = factory.make_VLAN()
@@ -837,6 +838,79 @@
         self.assertThat(
             config['dns_servers'],
             Equals([IPAddress(addr) for addr in subnet_dns_servers]))
+=======
+    def test__sets_ipv4_dns_from_arguments(self):
+        rack_controller = factory.make_RackController(interface=False)
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(vlan=vlan, dns_servers=[], version=4)
+        factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=rack_controller)
+        maas_dns = factory.make_ipv4_address()
+        ntp = factory.make_name('ntp')
+        default_domain = Domain.objects.get_default_domain()
+        config = dhcp.make_subnet_config(
+            rack_controller, subnet, maas_dns, ntp, default_domain)
+        self.expectThat(config['dns_servers'], Equals(maas_dns))
+
+    def test__sets_ipv6_dns_from_arguments(self):
+        rack_controller = factory.make_RackController(interface=False)
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(vlan=vlan, dns_servers=[], version=6)
+        factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=rack_controller)
+        maas_dns = factory.make_ipv6_address()
+        ntp = factory.make_name('ntp')
+        default_domain = Domain.objects.get_default_domain()
+        config = dhcp.make_subnet_config(
+            rack_controller, subnet, maas_dns, ntp, default_domain)
+        self.expectThat(config['dns_servers'], Equals(maas_dns))
+
+    def test__sets_ntp_from_arguments(self):
+        rack_controller = factory.make_RackController(interface=False)
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(vlan=vlan, dns_servers=[])
+        factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=rack_controller)
+        ntp = factory.make_name('ntp')
+        default_domain = Domain.objects.get_default_domain()
+        config = dhcp.make_subnet_config(
+            rack_controller, subnet, "", ntp, default_domain)
+        self.expectThat(config['ntp_server'], Equals(ntp))
+>>>>>>> MERGE-SOURCE
+
+    def test__overrides_ipv4_dns_from_subnet(self):
+        rack_controller = factory.make_RackController(interface=False)
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(vlan=vlan, version=4)
+        maas_dns = factory.make_ipv4_address()
+        subnet_dns_servers = ["8.8.8.8", "8.8.4.4"]
+        subnet.dns_servers = subnet_dns_servers
+        subnet.save()
+        factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=rack_controller)
+        ntp = factory.make_name('ntp')
+        default_domain = Domain.objects.get_default_domain()
+        config = dhcp.make_subnet_config(
+            rack_controller, subnet, maas_dns, ntp, default_domain)
+        self.expectThat(
+            config['dns_servers'], Equals(", ".join(subnet_dns_servers)))
+
+    def test__overrides_ipv6_dns_from_subnet(self):
+        rack_controller = factory.make_RackController(interface=False)
+        vlan = factory.make_VLAN()
+        subnet = factory.make_Subnet(vlan=vlan, version=6)
+        maas_dns = factory.make_ipv6_address()
+        subnet_dns_servers = ["2001:db8::1", "2001:db8::2"]
+        subnet.dns_servers = subnet_dns_servers
+        subnet.save()
+        factory.make_Interface(
+            INTERFACE_TYPE.PHYSICAL, vlan=vlan, node=rack_controller)
+        ntp = factory.make_name('ntp')
+        default_domain = Domain.objects.get_default_domain()
+        config = dhcp.make_subnet_config(
+            rack_controller, subnet, maas_dns, ntp, default_domain)
+        self.expectThat(
+            config['dns_servers'], Equals(", ".join(subnet_dns_servers)))
 
     def test__sets_domain_name_from_passed_domain(self):
         rack_controller = factory.make_RackController(interface=False)

=== modified file 'src/maasserver/tests/test_forms_interface_link.py'
=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2016-10-13 16:32:38 +0000
+++ src/maasserver/tests/test_preseed.py	2016-10-26 23:39:26 +0000
@@ -457,6 +457,33 @@
              'server_url', 'syslog_host_port'],
             context)
 
+<<<<<<< TREE
+=======
+    def test_get_preseed_context_archive_refs(self):
+        # urlparse lowercases the hostnames. That should not have any
+        # impact but for testing, create lower-case hostnames.
+        main_archive = factory.make_url(netloc="main-archive.example.com")
+        ports_archive = factory.make_url(netloc="ports-archive.example.com")
+        Config.objects.set_config('main_archive', main_archive)
+        Config.objects.set_config('ports_archive', ports_archive)
+        context = get_preseed_context()
+        parsed_main_archive = urlparse(main_archive)
+        parsed_ports_archive = urlparse(ports_archive)
+        self.assertEqual(
+            (
+                parsed_main_archive.hostname,
+                parsed_main_archive.path.lstrip('/'),
+                parsed_ports_archive.hostname,
+                parsed_ports_archive.path.lstrip('/'),
+            ),
+            (
+                context['main_archive_hostname'],
+                context['main_archive_directory'],
+                context['ports_archive_hostname'],
+                context['ports_archive_directory'],
+            ))
+
+>>>>>>> MERGE-SOURCE
 
 class TestNodePreseedContext(
         PreseedRPCMixin, BootImageHelperMixin, MAASTransactionServerTestCase):

=== modified file 'src/maasserver/tests/test_preseed_network.py'
--- src/maasserver/tests/test_preseed_network.py	2016-10-24 23:23:10 +0000
+++ src/maasserver/tests/test_preseed_network.py	2016-10-26 23:39:26 +0000
@@ -243,12 +243,21 @@
 
     def collectDNSConfig(self, node, ipv4=True, ipv6=True):
         config = "- type: nameserver\n  address: %s\n  search:\n" % (
+<<<<<<< TREE
             repr(node.get_default_dns_servers(ipv4=ipv4, ipv6=ipv6)))
         domain_name = node.domain.name
         dns_searches = [domain_name] + [
             name
             for name in sorted(get_dns_search_paths())
             if name != domain_name]
+=======
+            repr(node.get_default_dns_servers()))
+        domain_name = node.domain.name
+        dns_searches = [domain_name] + [
+            name
+            for name in sorted(get_dns_search_paths())
+            if name != domain_name]
+>>>>>>> MERGE-SOURCE
         for dns_name in dns_searches:
             config += "   - %s\n" % dns_name
         return config

=== modified file 'src/maasserver/tests/test_preseed_storage.py'
=== modified file 'src/maasserver/tests/test_start_up.py'
--- src/maasserver/tests/test_start_up.py	2016-06-29 10:00:16 +0000
+++ src/maasserver/tests/test_start_up.py	2016-10-26 23:39:26 +0000
@@ -145,6 +145,7 @@
         self.assertThat(RegionController.objects.all(), HasLength(1))
 
     def test__creates_maas_id_file(self):
+<<<<<<< TREE
         start_up.is_master_process.return_value = False
         self.assertThat(get_maas_id(), Is(None))
         with post_commit_hooks:
@@ -173,3 +174,95 @@
                 Traceback (most recent call last):...
                 Failure: maastesting.factory.TestException#...: boom
                 """))
+=======
+        self.patch(start_up, "is_master_process").return_value = True
+        mock_set_maas_id = self.patch_autospec(start_up, "set_maas_id")
+        self.patch(start_up.RegionController, 'refresh')
+        with post_commit_hooks:
+            start_up.inner_start_up()
+        self.assertThat(mock_set_maas_id, MockCalledOnce())
+
+    def test__doesnt_create_maas_id_file_if_not_master(self):
+        self.patch(start_up, "is_master_process").return_value = False
+        mock_set_maas_id = self.patch_autospec(start_up, "set_maas_id")
+        with post_commit_hooks:
+            start_up.inner_start_up()
+        self.assertThat(mock_set_maas_id, MockNotCalled())
+
+
+class TestCreateRegionObj(MAASServerTestCase):
+
+    """Tests for the actual work done in `create_region_obj`."""
+
+    def test__creates_obj(self):
+        region = start_up.create_region_obj()
+        self.assertIsNotNone(region)
+        self.assertIsNotNone(
+            RegionController.objects.get(system_id=region.system_id))
+
+    def test__doesnt_read_maas_id_from_cache(self):
+        set_maas_id(factory.make_string())
+        os.unlink(get_path('/var/lib/maas/maas_id'))
+        region = start_up.create_region_obj()
+        self.assertIsNotNone(region)
+        self.assertIsNotNone(
+            RegionController.objects.get(system_id=region.system_id))
+
+    def test__finds_region_by_maas_id(self):
+        region = factory.make_RegionController()
+        self.useFixture(MAASIDFixture(region.system_id))
+        self.assertEquals(region, start_up.create_region_obj())
+
+    def test__finds_region_by_hostname(self):
+        region = factory.make_RegionController()
+        mock_gethostname = self.patch_autospec(start_up, "gethostname")
+        mock_gethostname.return_value = region.hostname
+        self.assertEquals(region, start_up.create_region_obj())
+
+    def test__finds_region_by_mac(self):
+        region = factory.make_RegionController()
+        factory.make_Interface(node=region)
+        mock_get_mac_addresses = self.patch_autospec(
+            start_up, "get_mac_addresses")
+        mock_get_mac_addresses.return_value = [
+            nic.mac_address.raw
+            for nic in region.interface_set.all()
+        ]
+        self.assertEquals(region, start_up.create_region_obj())
+
+    def test__converts_rack_to_region_rack(self):
+        rack = factory.make_RackController()
+        self.useFixture(MAASIDFixture(rack.system_id))
+        region_rack = start_up.create_region_obj()
+        self.assertEquals(rack, region_rack)
+        self.assertEquals(
+            region_rack.node_type, NODE_TYPE.REGION_AND_RACK_CONTROLLER)
+
+    def test__converts_node_to_region_rack(self):
+        node = factory.make_Node(
+            node_type=factory.pick_choice(
+                NODE_TYPE_CHOICES,
+                but_not=[
+                    NODE_TYPE.REGION_CONTROLLER,
+                    NODE_TYPE.RACK_CONTROLLER,
+                    NODE_TYPE.REGION_AND_RACK_CONTROLLER,
+                ]))
+        self.useFixture(MAASIDFixture(node.system_id))
+        region = start_up.create_region_obj()
+        self.assertEquals(node, region)
+        self.assertEquals(region.node_type, NODE_TYPE.REGION_CONTROLLER)
+
+    def test__sets_owner_if_none(self):
+        region = factory.make_RegionController()
+        self.useFixture(MAASIDFixture(region.system_id))
+        self.assertEquals(
+            get_worker_user(), start_up.create_region_obj().owner)
+
+    def test__leaves_owner_if_set(self):
+        region = factory.make_RegionController()
+        self.useFixture(MAASIDFixture(region.system_id))
+        user = factory.make_User()
+        region.owner = user
+        region.save()
+        self.assertEquals(user, start_up.create_region_obj().owner)
+>>>>>>> MERGE-SOURCE

=== modified file 'src/maasserver/triggers/tests/test_websocket.py'
=== modified file 'src/maasserver/triggers/tests/test_websocket_listener.py'
--- src/maasserver/triggers/tests/test_websocket_listener.py	2016-10-12 15:26:17 +0000
+++ src/maasserver/triggers/tests/test_websocket_listener.py	2016-10-26 23:39:26 +0000
@@ -2923,6 +2923,7 @@
             yield listener.stopService()
 
 
+<<<<<<< TREE
 class TestPackageRepositoryListener(
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
     """End-to-end test of both the listeners code and the cluster
@@ -3102,6 +3103,129 @@
             yield listener.stopService()
 
 
+=======
+class TestIPRangeSubnetListener(
+        MAASTransactionServerTestCase, TransactionalHelpersMixin):
+    """End-to-end test of both the listeners code and the triggers on
+    maasserver_iprange tables that notifies affected subnets."""
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_create_notification(self):
+        yield deferToDatabase(register_websocket_triggers)
+        subnet = yield deferToDatabase(
+            self.create_subnet, {
+                "cidr": '192.168.0.0/24',
+                "gateway_ip": '192.168.0.1',
+                "dns_servers": [],
+                })
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register("subnet", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            iprange = yield deferToDatabase(
+                self.create_iprange, {
+                    "type": IPRANGE_TYPE.DYNAMIC,
+                    "subnet": subnet,
+                    "start_ip": '192.168.0.100',
+                    "end_ip": '192.168.0.110',
+                    })
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % iprange.subnet.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_update_notification(self):
+        yield deferToDatabase(register_websocket_triggers)
+        iprange = yield deferToDatabase(self.create_iprange)
+        new_end_ip = factory.pick_ip_in_IPRange(iprange)
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register("subnet", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(
+                self.update_iprange,
+                iprange.id, {"end_ip": new_end_ip})
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % iprange.subnet.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_update_on_old_and_new_subnet_notification(self):
+        yield deferToDatabase(register_websocket_triggers)
+        old_subnet = yield deferToDatabase(
+            self.create_subnet, {
+                "cidr": '192.168.0.0/24',
+                "gateway_ip": '192.168.0.1',
+                "dns_servers": [],
+                })
+        new_subnet = yield deferToDatabase(
+            self.create_subnet, {
+                "cidr": '192.168.1.0/24',
+                "gateway_ip": '192.168.1.1',
+                "dns_servers": [],
+                })
+        iprange = yield deferToDatabase(
+            self.create_iprange, {
+                "type": IPRANGE_TYPE.DYNAMIC,
+                "subnet": old_subnet,
+                "start_ip": '192.168.0.100',
+                "end_ip": '192.168.0.110',
+                })
+        dvs = [DeferredValue(), DeferredValue()]
+
+        def set_defer_value(*args):
+            for dv in dvs:
+                if not dv.isSet:
+                    dv.set(args)
+                    break
+
+        listener = PostgresListenerService()
+        listener.register("subnet", set_defer_value)
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.update_iprange, iprange.id, {
+                "type": IPRANGE_TYPE.DYNAMIC,
+                "subnet": new_subnet,
+                "start_ip": '192.168.1.10',
+                "end_ip": '192.168.1.150',
+                })
+            yield dvs[0].get(timeout=2)
+            yield dvs[1].get(timeout=2)
+            self.assertItemsEqual([
+                ('update', '%s' % old_subnet.id),
+                ('update', '%s' % new_subnet.id),
+                ], [dvs[0].value, dvs[1].value])
+        finally:
+            yield listener.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test__calls_handler_on_delete_notification(self):
+        yield deferToDatabase(register_websocket_triggers)
+        iprange = yield deferToDatabase(self.create_iprange)
+
+        listener = PostgresListenerService()
+        dv = DeferredValue()
+        listener.register("subnet", lambda *args: dv.set(args))
+        yield listener.startService()
+        try:
+            yield deferToDatabase(self.delete_iprange, iprange.id)
+            yield dv.get(timeout=2)
+            self.assertEqual(('update', '%s' % iprange.subnet.id), dv.value)
+        finally:
+            yield listener.stopService()
+
+
+>>>>>>> MERGE-SOURCE
 class TestNodeTypeChange(
         MAASTransactionServerTestCase, TransactionalHelpersMixin):
     """End-to-end test of node type change triggers code."""

=== modified file 'src/maasserver/triggers/websocket.py'
=== added file 'src/maasserver/views/tests/test_images.py.OTHER'
--- src/maasserver/views/tests/test_images.py.OTHER	1970-01-01 00:00:00 +0000
+++ src/maasserver/views/tests/test_images.py.OTHER	2016-10-26 23:39:26 +0000
@@ -0,0 +1,991 @@
+# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Test maasserver images views."""
+
+__all__ = []
+
+import datetime
+import http.client
+import json
+import random
+
+from django.conf import settings
+from django.core.urlresolvers import reverse
+from lxml.html import fromstring
+from maasserver.enum import (
+    BOOT_RESOURCE_TYPE,
+    NODE_STATUS,
+)
+from maasserver.models import (
+    BootResource,
+    BootSourceCache,
+    BootSourceSelection,
+    Config,
+)
+from maasserver.models.signals import bootsources
+from maasserver.testing import extract_redirect
+from maasserver.testing.factory import factory
+from maasserver.testing.testcase import MAASServerTestCase
+from maasserver.utils.converters import human_readable_bytes
+from maasserver.utils.orm import (
+    get_one,
+    reload_object,
+)
+from maasserver.views import images as images_view
+from maastesting.matchers import (
+    MockCalledOnceWith,
+    MockCalledWith,
+)
+from requests import ConnectionError
+from testtools.matchers import (
+    ContainsAll,
+    HasLength,
+)
+
+
+class UbuntuImagesTest(MAASServerTestCase):
+
+    def setUp(self):
+        super(UbuntuImagesTest, self).setUp()
+        # Disable boot source cache signals.
+        self.addCleanup(bootsources.signals.enable)
+        bootsources.signals.disable()
+
+    def patch_get_os_info_from_boot_sources(
+            self, sources, releases=None, arches=None):
+        if releases is None:
+            releases = [factory.make_name('release') for _ in range(3)]
+        if arches is None:
+            arches = [factory.make_name('arch') for _ in range(3)]
+        mock_get_os_info = self.patch(
+            images_view, 'get_os_info_from_boot_sources')
+        mock_get_os_info.return_value = (sources, releases, arches)
+        return mock_get_os_info
+
+    def test_shows_connection_error(self):
+        self.client_log_in(as_admin=True)
+        mock_get_os_info = self.patch(
+            images_view, 'get_os_info_from_boot_sources')
+        mock_get_os_info.side_effect = ConnectionError()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        warnings = doc.cssselect('div#connection-error')
+        self.assertEqual(1, len(warnings))
+
+    def test_shows_no_ubuntu_sources(self):
+        self.client_log_in(as_admin=True)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        warnings = doc.cssselect('div#no-ubuntu-sources')
+        self.assertEqual(1, len(warnings))
+
+    def test_shows_too_many_ubuntu_sources(self):
+        self.client_log_in(as_admin=True)
+        sources = [factory.make_BootSource() for _ in range(2)]
+        self.patch_get_os_info_from_boot_sources(sources)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        warnings = doc.cssselect('div#too-many-ubuntu-sources')
+        self.assertEqual(1, len(warnings))
+
+    def test_shows_release_options(self):
+        self.client_log_in(as_admin=True)
+        sources = [factory.make_BootSource()]
+        releases = [factory.make_name('release') for _ in range(3)]
+        self.patch_get_os_info_from_boot_sources(sources, releases=releases)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        releases_content = doc.cssselect(
+            'ul#ubuntu-releases')[0].text_content()
+        self.assertThat(releases_content, ContainsAll(releases))
+
+    def test_shows_architecture_options(self):
+        self.client_log_in(as_admin=True)
+        sources = [factory.make_BootSource()]
+        arches = [factory.make_name('arch') for _ in range(3)]
+        self.patch_get_os_info_from_boot_sources(sources, arches=arches)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        arches_content = doc.cssselect(
+            'ul#ubuntu-arches')[0].text_content()
+        self.assertThat(arches_content, ContainsAll(arches))
+
+    def test_shows_missing_images_warning_if_not_ubuntu_boot_resources(self):
+        self.client_log_in()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        warnings = doc.cssselect('div#missing-ubuntu-images')
+        self.assertEqual(1, len(warnings))
+
+    def test_hides_import_button_if_not_admin(self):
+        self.client_log_in()
+        sources = [factory.make_BootSource()]
+        self.patch_get_os_info_from_boot_sources(sources)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        import_button = doc.cssselect(
+            '#ubuntu-images')[0].cssselect('input[type="submit"]')
+        self.assertEqual(0, len(import_button))
+
+    def test_shows_import_button_if_admin(self):
+        self.client_log_in(as_admin=True)
+        sources = [factory.make_BootSource()]
+        self.patch_get_os_info_from_boot_sources(sources)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        import_button = doc.cssselect(
+            '#ubuntu-images')[0].cssselect('input[type="submit"]')
+        self.assertEqual(1, len(import_button))
+
+    def test_post_returns_forbidden_if_not_admin(self):
+        self.client_log_in()
+        response = self.client.post(
+            reverse('images'), {'ubuntu_images': 1})
+        self.assertEqual(http.client.FORBIDDEN, response.status_code)
+
+    def test_import_calls_import_resources(self):
+        self.client_log_in(as_admin=True)
+        sources = [factory.make_BootSource()]
+        self.patch_get_os_info_from_boot_sources(sources)
+        mock_import = self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'ubuntu_images': 1})
+        self.assertEqual(http.client.FOUND, response.status_code)
+        self.assertThat(mock_import, MockCalledOnceWith())
+
+    def test_import_sets_empty_selections(self):
+        self.client_log_in(as_admin=True)
+        source = factory.make_BootSource()
+        self.patch_get_os_info_from_boot_sources([source])
+        self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'ubuntu_images': 1})
+        self.assertEqual(http.client.FOUND, response.status_code)
+
+        selections = BootSourceSelection.objects.filter(boot_source=source)
+        self.assertThat(selections, HasLength(1))
+        self.assertEqual(
+            (selections[0].os, selections[0].release,
+                selections[0].arches, selections[0].subarches,
+                selections[0].labels),
+            ("ubuntu", "", [], ["*"], ["*"]))
+
+    def test_import_sets_release_selections(self):
+        self.client_log_in(as_admin=True)
+        source = factory.make_BootSource()
+        releases = [factory.make_name('release') for _ in range(3)]
+        self.patch_get_os_info_from_boot_sources([source])
+        self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'ubuntu_images': 1, 'release': releases})
+        self.assertEqual(http.client.FOUND, response.status_code)
+
+        selections = BootSourceSelection.objects.filter(boot_source=source)
+        self.assertThat(selections, HasLength(len(releases)))
+        self.assertItemsEqual(
+            releases,
+            [selection.release for selection in selections])
+
+    def test_import_sets_arches_on_selections(self):
+        self.client_log_in(as_admin=True)
+        source = factory.make_BootSource()
+        releases = [factory.make_name('release') for _ in range(3)]
+        arches = [factory.make_name('arches') for _ in range(3)]
+        self.patch_get_os_info_from_boot_sources([source])
+        self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'),
+            {'ubuntu_images': 1, 'release': releases, 'arch': arches})
+        self.assertEqual(http.client.FOUND, response.status_code)
+
+        selections = BootSourceSelection.objects.filter(boot_source=source)
+        self.assertThat(selections, HasLength(len(releases)))
+        self.assertItemsEqual(
+            [arches, arches, arches],
+            [selection.arches for selection in selections])
+
+    def test_import_removes_old_selections(self):
+        self.client_log_in(as_admin=True)
+        source = factory.make_BootSource()
+        release = factory.make_name('release')
+        delete_selection = BootSourceSelection.objects.create(
+            boot_source=source, os='ubuntu',
+            release=factory.make_name('release'))
+        keep_selection = BootSourceSelection.objects.create(
+            boot_source=source, os='ubuntu', release=release)
+        self.patch_get_os_info_from_boot_sources([source])
+        self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'ubuntu_images': 1, 'release': [release]})
+        self.assertEqual(http.client.FOUND, response.status_code)
+        self.assertIsNone(reload_object(delete_selection))
+        self.assertIsNotNone(reload_object(keep_selection))
+
+
+class OtherImagesTest(MAASServerTestCase):
+
+    def setUp(self):
+        super(OtherImagesTest, self).setUp()
+        # Disable boot source cache signals.
+        self.addCleanup(bootsources.signals.enable)
+        bootsources.signals.disable()
+
+    def make_other_resource(self, os=None, arch=None, subarch=None,
+                            release=None):
+        if os is None:
+            os = factory.make_name('os')
+        if arch is None:
+            arch = factory.make_name('arch')
+        if subarch is None:
+            subarch = factory.make_name('subarch')
+        if release is None:
+            release = factory.make_name('release')
+        name = '%s/%s' % (os, release)
+        architecture = '%s/%s' % (arch, subarch)
+        resource = factory.make_BootResource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED,
+            name=name, architecture=architecture)
+        resource_set = factory.make_BootResourceSet(resource)
+        factory.make_boot_resource_file_with_content(resource_set)
+        return resource
+
+    def test_hides_other_synced_images_section(self):
+        self.client_log_in()
+        BootSourceCache.objects.all().delete()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        section = doc.cssselect('div#other-sync-images')
+        self.assertEqual(
+            0, len(section), "Didn't hide the other images section.")
+
+    def test_shows_other_synced_images_section(self):
+        self.client_log_in(as_admin=True)
+        factory.make_BootSourceCache()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        section = doc.cssselect('div#other-sync-images')
+        self.assertEqual(
+            1, len(section), "Didn't show the other images section.")
+
+    def test_hides_image_from_boot_source_cache_without_admin(self):
+        self.client_log_in()
+        factory.make_BootSourceCache()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        rows = doc.cssselect('table#other-resources > tbody > tr')
+        self.assertEqual(
+            0, len(rows), "Didn't hide unselected boot image from non-admin.")
+
+    def test_shows_image_from_boot_source_cache_with_admin(self):
+        self.client_log_in(as_admin=True)
+        cache = factory.make_BootSourceCache()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        title = doc.cssselect(
+            'table#other-resources > tbody > '
+            'tr > td')[1].text_content().strip()
+        self.assertEqual('%s/%s' % (cache.os, cache.release), title)
+
+    def test_shows_checkbox_for_boot_source_cache(self):
+        self.client_log_in(as_admin=True)
+        factory.make_BootSourceCache()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        checkbox = doc.cssselect(
+            'table#other-resources > tbody > tr > td > input')
+        self.assertEqual(
+            1, len(checkbox), "Didn't show checkbox for boot image.")
+
+    def test_shows_last_update_time_for_synced_resource(self):
+        self.client_log_in(as_admin=True)
+        cache = factory.make_BootSourceCache()
+        self.make_other_resource(
+            os=cache.os, arch=cache.arch,
+            subarch=cache.subarch, release=cache.release)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        last_update = doc.cssselect(
+            'table#other-resources > tbody > '
+            'tr > td')[5].text_content().strip()
+        dt = datetime.datetime.strptime(last_update, '%a, %d %b. %Y %H:%M:%S')
+        # TimestampedModel includes microseconds which we don't print. To
+        # confirm the right time is returned its easiest to just compare the
+        # ctimes
+        self.assertEquals(cache.updated.ctime(), dt.ctime())
+
+    def test_shows_number_of_nodes_for_synced_resource(self):
+        self.client_log_in(as_admin=True)
+        cache = factory.make_BootSourceCache()
+        resource = self.make_other_resource(
+            os=cache.os, arch=cache.arch,
+            subarch=cache.subarch, release=cache.release)
+        factory.make_Node(
+            status=NODE_STATUS.DEPLOYED,
+            osystem=cache.os, distro_series=cache.release,
+            architecture=resource.architecture)
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        number_of_nodes = doc.cssselect(
+            'table#other-resources > tbody > '
+            'tr > td')[4].text_content().strip()
+        self.assertEqual(
+            1, int(number_of_nodes),
+            "Incorrect number of deployed nodes for resource.")
+
+    def test_shows_apply_button_if_admin(self):
+        self.client_log_in(as_admin=True)
+        factory.make_BootSourceCache()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        apply_button = doc.cssselect(
+            '#other-sync-images')[0].cssselect('input[type="submit"]')
+        self.assertEqual(
+            1, len(apply_button), "Didn't show apply button for admin.")
+
+    def test_hides_apply_button_if_import_running(self):
+        self.client_log_in(as_admin=True)
+        factory.make_BootSourceCache()
+        self.patch(
+            images_view, 'is_import_resources_running').return_value = True
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        apply_button = doc.cssselect(
+            '#other-sync-images')[0].cssselect('input[type="submit"]')
+        self.assertEqual(
+            0, len(apply_button),
+            "Didn't hide apply button when import running.")
+
+    def test_calls_get_os_release_title_for_other_resource(self):
+        self.client_log_in()
+        title = factory.make_name('title')
+        cache = factory.make_BootSourceCache()
+        resource = self.make_other_resource(
+            os=cache.os, arch=cache.arch,
+            subarch=cache.subarch, release=cache.release)
+        mock_get_title = self.patch(images_view, 'get_os_release_title')
+        mock_get_title.return_value = title
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        row_title = doc.cssselect(
+            'table#other-resources > tbody > '
+            'tr > td')[1].text_content().strip()
+        self.assertEqual(title, row_title)
+        os, release = resource.name.split('/')
+        self.assertThat(mock_get_title, MockCalledWith(os, release))
+
+    def test_post_returns_forbidden_if_not_admin(self):
+        self.client_log_in()
+        response = self.client.post(
+            reverse('images'), {'other_images': 1})
+        self.assertEqual(http.client.FORBIDDEN, response.status_code)
+
+    def test_post_clears_all_other_os_selections(self):
+        self.client_log_in(as_admin=True)
+        source = factory.make_BootSource()
+        ubuntu_selection = BootSourceSelection.objects.create(
+            boot_source=source, os='ubuntu')
+        other_selection = BootSourceSelection.objects.create(
+            boot_source=source, os=factory.make_name('os'))
+        self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'other_images': 1, 'image': []})
+        self.assertEqual(http.client.FOUND, response.status_code)
+        self.assertIsNotNone(reload_object(ubuntu_selection))
+        self.assertIsNone(reload_object(other_selection))
+
+    def test_post_creates_selection_with_multiple_arches(self):
+        self.client_log_in(as_admin=True)
+        source = factory.make_BootSource()
+        os = factory.make_name('os')
+        release = factory.make_name('release')
+        arches = [factory.make_name('arch') for _ in range(3)]
+        images = []
+        for arch in arches:
+            factory.make_BootSourceCache(
+                boot_source=source, os=os, release=release, arch=arch)
+            images.append('%s/%s/subarch/%s' % (os, arch, release))
+        self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'other_images': 1, 'image': images})
+        self.assertEqual(http.client.FOUND, response.status_code)
+
+        selection = get_one(BootSourceSelection.objects.filter(
+            boot_source=source, os=os, release=release))
+        self.assertIsNotNone(selection)
+        self.assertItemsEqual(arches, selection.arches)
+
+    def test_post_calls_import_resources(self):
+        self.client_log_in(as_admin=True)
+        mock_import = self.patch(images_view, 'import_resources')
+        response = self.client.post(
+            reverse('images'), {'other_images': 1, 'image': []})
+        self.assertEqual(http.client.FOUND, response.status_code)
+        self.assertThat(mock_import, MockCalledOnceWith())
+
+
+class GeneratedImagesTest(MAASServerTestCase):
+
+    def make_generated_resource(self, os=None, arch=None, subarch=None,
+                                release=None):
+        if os is None:
+            os = factory.make_name('os')
+        if arch is None:
+            arch = factory.make_name('arch')
+        if subarch is None:
+            subarch = factory.make_name('subarch')
+        if release is None:
+            release = factory.make_name('release')
+        name = '%s/%s' % (os, release)
+        architecture = '%s/%s' % (arch, subarch)
+        resource = factory.make_BootResource(
+            rtype=BOOT_RESOURCE_TYPE.GENERATED,
+            name=name, architecture=architecture)
+        resource_set = factory.make_BootResourceSet(resource)
+        factory.make_boot_resource_file_with_content(resource_set)
+        return resource
+
+    def test_hides_generated_images_section(self):
+        self.client_log_in()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        section = doc.cssselect('div#generated-images')
+        self.assertEqual(
+            0, len(section), "Didn't hide the generated images section.")
+
+    def test_shows_generated_images_section(self):
+        self.client_log_in()
+        self.make_generated_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        section = doc.cssselect('div#generated-images')
+        self.assertEqual(
+            1, len(section), "Didn't show the generated images section.")
+
+    def test_shows_generated_resources(self):
+        self.client_log_in()
+        resources = [self.make_generated_resource() for _ in range(3)]
+        names = [resource.name for resource in resources]
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        table_content = doc.cssselect(
+            'table#generated-resources')[0].text_content()
+        self.assertThat(table_content, ContainsAll(names))
+
+    def test_shows_delete_button_for_generated_resource(self):
+        self.client_log_in(as_admin=True)
+        self.make_generated_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        delete_btn = doc.cssselect(
+            'table#generated-resources > tbody > tr > td > '
+            'a[title="Delete image"]')
+        self.assertEqual(
+            1, len(delete_btn),
+            "Didn't show delete button for generated image.")
+
+    def test_shows_last_update_time_for_synced_resource(self):
+        self.client_log_in(as_admin=True)
+        resource = self.make_generated_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        last_update = doc.cssselect(
+            'table#generated-resources > tbody > '
+            'tr > td')[5].text_content().strip()
+        dt = datetime.datetime.strptime(last_update, '%a, %d %b. %Y %H:%M:%S')
+        # TimestampedModel includes microseconds which we don't print. To
+        # confirm the right time is returned its easiest to just compare the
+        # ctimes
+        self.assertEquals(resource.updated.ctime(), dt.ctime())
+
+    def test_hides_delete_button_for_generated_resource_when_not_admin(self):
+        self.client_log_in()
+        self.make_generated_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        delete_btn = doc.cssselect(
+            'table#generated-resources > tbody > tr > td > '
+            'a[title="Delete image"]')
+        self.assertEqual(
+            0, len(delete_btn),
+            "Didn't hide delete button for generated image when not admin.")
+
+    def test_calls_get_os_release_title_for_generated_resource(self):
+        self.client_log_in()
+        title = factory.make_name('title')
+        resource = self.make_generated_resource()
+        mock_get_title = self.patch(images_view, 'get_os_release_title')
+        mock_get_title.return_value = title
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        row_title = doc.cssselect(
+            'table#generated-resources > tbody > '
+            'tr > td')[1].text_content().strip()
+        self.assertEqual(title, row_title)
+        os, release = resource.name.split('/')
+        self.assertThat(mock_get_title, MockCalledOnceWith(os, release))
+
+
+class UploadedImagesTest(MAASServerTestCase):
+
+    def make_uploaded_resource(self, name=None):
+        if name is None:
+            name = factory.make_name('name')
+        arch = factory.make_name('arch')
+        subarch = factory.make_name('subarch')
+        architecture = '%s/%s' % (arch, subarch)
+        resource = factory.make_BootResource(
+            rtype=BOOT_RESOURCE_TYPE.UPLOADED,
+            name=name, architecture=architecture)
+        resource_set = factory.make_BootResourceSet(resource)
+        factory.make_boot_resource_file_with_content(resource_set)
+        return resource
+
+    def test_shows_no_custom_images_message(self):
+        self.client_log_in()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        warnings = doc.cssselect('div#no-custom-images')
+        self.assertEqual(1, len(warnings))
+
+    def test_shows_uploaded_resources(self):
+        self.client_log_in()
+        names = [factory.make_name('name') for _ in range(3)]
+        [self.make_uploaded_resource(name) for name in names]
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        table_content = doc.cssselect(
+            'table#uploaded-resources')[0].text_content()
+        self.assertThat(table_content, ContainsAll(names))
+
+    def test_shows_uploaded_resources_name_if_title_blank(self):
+        self.client_log_in()
+        name = factory.make_name('name')
+        resource = self.make_uploaded_resource(name)
+        resource.extra['title'] = ''
+        resource.save()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        name_col = doc.cssselect(
+            'table#uploaded-resources > tbody > tr > td')[1].text_content()
+        self.assertEqual(name, name_col.strip())
+
+    def test_shows_last_update_time_for_synced_resource(self):
+        self.client_log_in(as_admin=True)
+        resource = self.make_uploaded_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        last_update = doc.cssselect(
+            'table#uploaded-resources > tbody > '
+            'tr > td')[5].text_content().strip()
+        dt = datetime.datetime.strptime(last_update, '%a, %d %b. %Y %H:%M:%S')
+        # TimestampedModel includes microseconds which we don't print. To
+        # confirm the right time is returned its easiest to just compare the
+        # ctimes
+        self.assertEquals(resource.updated.ctime(), dt.ctime())
+
+    def test_shows_delete_button_for_uploaded_resource(self):
+        self.client_log_in(as_admin=True)
+        self.make_uploaded_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        delete_btn = doc.cssselect(
+            'table#uploaded-resources > tbody > tr > td > '
+            'a[title="Delete image"]')
+        self.assertEqual(1, len(delete_btn))
+
+    def test_hides_delete_button_for_uploaded_resource_when_not_admin(self):
+        self.client_log_in()
+        self.make_uploaded_resource()
+        response = self.client.get(reverse('images'))
+        doc = fromstring(response.content)
+        delete_btn = doc.cssselect(
+            'table#uploaded-resources > tbody > tr > td > '
+            'a[title="Delete image"]')
+        self.assertEqual(0, len(delete_btn))
+
+
+class TestImageAjax(MAASServerTestCase):
+
+    def get_images_ajax(self):
+        return self.client.get(
+            reverse('images'), HTTP_X_REQUESTED_WITH='XMLHttpRequest')
+
+    def test__returns_json(self):
+        self.client_log_in()
+        response = self.get_images_ajax()
+        self.assertEqual('application/json', response['Content-Type'])
+
+    def test__returns_region_import_running_True(self):
+        self.client_log_in()
+        self.patch(
+            images_view, 'is_import_resources_running').return_value = True
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertTrue(json_obj['region_import_running'])
+
+    def test__returns_region_import_running_False(self):
+        self.client_log_in()
+        self.patch(
+            images_view, 'is_import_resources_running').return_value = False
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertFalse(json_obj['region_import_running'])
+
+    def test__returns_cluster_import_running_True(self):
+        self.client_log_in()
+        self.patch(
+            images_view, 'is_import_boot_images_running').return_value = True
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertTrue(json_obj['cluster_import_running'])
+
+    def test__returns_cluster_import_running_False(self):
+        self.client_log_in()
+        self.patch(
+            images_view, 'is_import_boot_images_running').return_value = False
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertFalse(json_obj['cluster_import_running'])
+
+    def test_returns_resources(self):
+        self.client_log_in()
+        resources = [factory.make_usable_boot_resource() for _ in range(3)]
+        resource_ids = [resource.id for resource in resources]
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_ids = [
+            json_resource['id']
+            for json_resource in json_obj['resources']
+            ]
+        self.assertItemsEqual(resource_ids, json_ids)
+
+    def test_returns_resources_datetime_format(self):
+        """Ensure the date/time format is correct"""
+        self.client_log_in()
+        resource = factory.make_usable_boot_resource()
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_updated = datetime.datetime.strptime(
+            json_obj['resources'][0]['lastUpdate'], "%a, %d %b. %Y %H:%M:%S")
+        self.assertEqual(resource.updated.timetuple(),
+                         json_updated.timetuple())
+
+    def test_returns_resource_attributes(self):
+        self.client_log_in()
+        factory.make_usable_boot_resource()
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertThat(
+            json_resource,
+            ContainsAll([
+                'id', 'rtype', 'name', 'title', 'arch', 'size',
+                'complete', 'status', 'downloading',
+                'numberOfNodes', 'lastUpdate']))
+
+    def test_returns_ubuntu_release_version_name(self):
+        self.client_log_in()
+        # Use trusty as known to map to "14.04 LTS"
+        version = '14.04 LTS'
+        name = 'ubuntu/trusty'
+        factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED, name=name)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(version, json_resource['title'])
+
+    def test_shows_number_of_nodes_deployed_for_resource(self):
+        self.client_log_in()
+        resource = factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED)
+        os_name, series = resource.name.split('/')
+        number_of_nodes = random.randint(1, 4)
+        for _ in range(number_of_nodes):
+            factory.make_Node(
+                status=NODE_STATUS.DEPLOYED,
+                osystem=os_name, distro_series=series,
+                architecture=resource.architecture)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(number_of_nodes, json_resource['numberOfNodes'])
+
+    def test_shows_number_of_nodes_deployed_for_resource_with_defaults(self):
+        self.client_log_in()
+        resource = factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED)
+        os_name, series = resource.name.split('/')
+        Config.objects.set_config('default_osystem', os_name)
+        Config.objects.set_config('default_distro_series', series)
+        number_of_nodes = random.randint(1, 4)
+        for _ in range(number_of_nodes):
+            factory.make_Node(
+                status=NODE_STATUS.DEPLOYED,
+                architecture=resource.architecture)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(number_of_nodes, json_resource['numberOfNodes'])
+
+    def test_shows_number_of_nodes_deployed_for_ubuntu_subarch_resource(self):
+        self.client_log_in()
+        resource = factory.make_usable_boot_resource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED)
+        arch, subarch = resource.split_arch()
+        extra_subarch = factory.make_name('subarch')
+        resource.extra['subarches'] = ','.join([subarch, extra_subarch])
+        resource.save()
+
+        os_name, series = resource.name.split('/')
+        node_architecture = '%s/%s' % (arch, extra_subarch)
+        number_of_nodes = random.randint(1, 4)
+        for _ in range(number_of_nodes):
+            factory.make_Node(
+                status=NODE_STATUS.DEPLOYED,
+                osystem=os_name, distro_series=series,
+                architecture=node_architecture)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(number_of_nodes, json_resource['numberOfNodes'])
+
+    def test_combines_subarch_resources_into_one_resource(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        for subarch in subarches:
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        self.assertEqual(
+            1, len(json_obj['resources']),
+            'More than one resource was returned.')
+
+    def test_combined_subarch_resource_calculates_unique_size(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        largefile = factory.make_LargeFile()
+        for subarch in subarches:
+            resource = factory.make_BootResource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+            resource_set = factory.make_BootResourceSet(resource)
+            factory.make_BootResourceFile(resource_set, largefile)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(
+            human_readable_bytes(largefile.total_size), json_resource['size'])
+
+    def test_combined_subarch_resource_calculates_num_of_nodes_deployed(self):
+        self.client_log_in()
+        osystem = 'ubuntu'
+        series = factory.make_name('series')
+        name = '%s/%s' % (osystem, series)
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        for subarch in subarches:
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+
+        number_of_nodes = random.randint(1, 4)
+        for _ in range(number_of_nodes):
+            subarch = random.choice(subarches)
+            node_architecture = '%s/%s' % (arch, subarch)
+            factory.make_Node(
+                status=NODE_STATUS.DEPLOYED,
+                osystem=osystem, distro_series=series,
+                architecture=node_architecture)
+
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(number_of_nodes, json_resource['numberOfNodes'])
+
+    def test_combined_subarch_resource_calculates_complete_True(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        resources = [
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+            for subarch in subarches
+            ]
+        self.patch(
+            BootResource.objects,
+            'get_resources_matching_boot_images').return_value = resources
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertTrue(json_resource['complete'])
+
+    def test_combined_subarch_resource_calculates_complete_False(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        incomplete_subarch = subarches.pop()
+        factory.make_BootResource(
+            rtype=BOOT_RESOURCE_TYPE.SYNCED,
+            name=name, architecture='%s/%s' % (arch, incomplete_subarch))
+        for subarch in subarches:
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertFalse(json_resource['complete'])
+
+    def test_combined_subarch_resource_calculates_progress(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        largefile = factory.make_LargeFile()
+        largefile.total_size = largefile.total_size * 2
+        largefile.save()
+        for subarch in subarches:
+            resource = factory.make_BootResource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+            resource_set = factory.make_BootResourceSet(resource)
+            factory.make_BootResourceFile(resource_set, largefile)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual("Downloading  50%", json_resource['status'])
+
+    def test_combined_subarch_resource_shows_queued_if_no_progress(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        largefile = factory.make_LargeFile(
+            content="".encode(settings.DEFAULT_CHARSET))
+        for subarch in subarches:
+            resource = factory.make_BootResource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+            resource_set = factory.make_BootResourceSet(resource)
+            factory.make_BootResourceFile(resource_set, largefile)
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual("Queued for download", json_resource['status'])
+
+    def test_combined_subarch_resource_shows_complete_status(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        resources = [
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+            for subarch in subarches
+            ]
+        self.patch(
+            BootResource.objects,
+            'get_resources_matching_boot_images').return_value = resources
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual("Complete", json_resource['status'])
+
+    def test_combined_subarch_resource_shows_waiting_for_cluster_to_sync(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        for subarch in subarches:
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+        self.patch(
+            BootResource.objects,
+            'get_resources_matching_boot_images').return_value = []
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(
+            "Waiting for rack controller(s) to sync", json_resource['status'])
+
+    def test_combined_subarch_resource_shows_clusters_syncing(self):
+        self.client_log_in()
+        name = 'ubuntu/%s' % factory.make_name('series')
+        arch = factory.make_name('arch')
+        subarches = [factory.make_name('subarch') for _ in range(3)]
+        for subarch in subarches:
+            factory.make_usable_boot_resource(
+                rtype=BOOT_RESOURCE_TYPE.SYNCED,
+                name=name, architecture='%s/%s' % (arch, subarch))
+        self.patch(
+            BootResource.objects,
+            'get_resources_matching_boot_images').return_value = []
+        self.patch(
+            images_view, 'is_import_boot_images_running').return_value = True
+        response = self.get_images_ajax()
+        json_obj = json.loads(
+            response.content.decode(settings.DEFAULT_CHARSET))
+        json_resource = json_obj['resources'][0]
+        self.assertEqual(
+            "Syncing to rack controller(s)", json_resource['status'])
+
+
+class TestImageDelete(MAASServerTestCase):
+
+    def test_non_admin_cannot_delete(self):
+        self.client_log_in()
+        resource = factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
+        response = self.client.post(
+            reverse('image-delete', args=[resource.id]))
+        self.assertEqual(http.client.FORBIDDEN, response.status_code)
+        self.assertIsNotNone(reload_object(resource))
+
+    def test_deletes_resource(self):
+        self.client_log_in(as_admin=True)
+        resource = factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
+        response = self.client.post(
+            reverse('image-delete', args=[resource.id]),
+            {'post': 'yes'})
+        self.assertEqual(http.client.FOUND, response.status_code)
+        self.assertIsNone(reload_object(resource))
+
+    def test_redirects_to_images(self):
+        self.client_log_in(as_admin=True)
+        resource = factory.make_BootResource(rtype=BOOT_RESOURCE_TYPE.UPLOADED)
+        response = self.client.post(
+            reverse('image-delete', args=[resource.id]),
+            {'post': 'yes'})
+        self.assertEqual(reverse('images'), extract_redirect(response))

=== modified file 'src/maasserver/websockets/handlers/machine.py'
=== modified file 'src/maasserver/websockets/handlers/subnet.py'
=== modified file 'src/maasserver/websockets/handlers/tests/test_machine.py'
=== modified file 'src/maasserver/websockets/handlers/tests/test_subnet.py'
=== modified file 'src/maasserver/websockets/tests/test_base.py'
=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2016-09-13 20:58:15 +0000
+++ src/metadataserver/api.py	2016-10-26 23:39:26 +0000
@@ -168,6 +168,7 @@
         else:
             type_name = EVENT_TYPES.NODE_COMMISSIONING_EVENT_FAILED
     elif node.status == NODE_STATUS.DEPLOYING:
+<<<<<<< TREE
         if result in ['SUCCESS', None]:
             type_name = EVENT_TYPES.NODE_INSTALL_EVENT
         else:
@@ -177,6 +178,12 @@
             type_name = EVENT_TYPES.NODE_ENTERING_RESCUE_MODE_EVENT
         else:
             type_name = EVENT_TYPES.NODE_ENTERING_RESCUE_MODE_EVENT_FAILED
+=======
+        if result in ['SUCCESS', None]:
+            type_name = EVENT_TYPES.NODE_INSTALL_EVENT
+        else:
+            type_name = EVENT_TYPES.NODE_INSTALL_EVENT_FAILED
+>>>>>>> MERGE-SOURCE
     elif node.node_type in [
             NODE_TYPE.RACK_CONTROLLER,
             NODE_TYPE.REGION_AND_RACK_CONTROLLER]:

=== modified file 'src/metadataserver/fields.py'
=== modified file 'src/metadataserver/tests/test_fields.py'
=== modified file 'src/provisioningserver/boot/powernv.py'
=== modified file 'src/provisioningserver/boot/tests/test_powernv.py'
=== modified file 'src/provisioningserver/dns/tests/test_zoneconfig.py'
--- src/provisioningserver/dns/tests/test_zoneconfig.py	2016-09-12 19:33:29 +0000
+++ src/provisioningserver/dns/tests/test_zoneconfig.py	2016-10-26 23:39:26 +0000
@@ -210,6 +210,53 @@
             )
         )
 
+    def test_handles_slash_32_dynamic_range(self):
+        target_dir = patch_dns_config_path(self)
+        domain = factory.make_string()
+        network = factory.make_ipv4_network()
+        dns_ip = factory.pick_ip_in_network(network)
+        ipv4_hostname = factory.make_name('host')
+        ipv4_ip = factory.pick_ip_in_network(network)
+        range_ip = factory.pick_ip_in_network(network, but_not={ipv4_ip})
+        ipv6_hostname = factory.make_name('host')
+        ipv6_ip = factory.make_ipv6_address()
+        ttl = random.randint(10, 300)
+        mapping = {
+            ipv4_hostname: HostnameIPMapping(None, ttl, {ipv4_ip}),
+            ipv6_hostname: HostnameIPMapping(None, ttl, {ipv6_ip}),
+        }
+        dynamic_range = IPRange(IPAddress(range_ip), IPAddress(range_ip))
+        expected_generate_directives = (
+            DNSForwardZoneConfig.get_GENERATE_directives(
+                dynamic_range))
+        other_mapping = {ipv4_hostname: HostnameRRsetMapping(
+            None, {(ttl, 'MX', '10 bar')})}
+        dns_zone_config = DNSForwardZoneConfig(
+            domain, serial=random.randint(1, 100),
+            other_mapping=other_mapping, default_ttl=ttl,
+            mapping=mapping, dns_ip=dns_ip,
+            dynamic_ranges=[dynamic_range])
+        dns_zone_config.write_config()
+        self.assertThat(
+            os.path.join(target_dir, 'zone.%s' % domain),
+            FileContains(
+                matcher=ContainsAll(
+                    [
+                        '$TTL %d' % ttl,
+                        '%s %d IN A %s' % (ipv4_hostname, ttl, ipv4_ip),
+                        '%s %d IN AAAA %s' % (ipv6_hostname, ttl, ipv6_ip),
+                        '%s %d IN MX 10 bar' % (ipv4_hostname, ttl),
+                    ] +
+                    [
+                        '$GENERATE %s %s IN A %s' % (
+                            iterator_values, reverse_dns, hostname)
+                        for iterator_values, reverse_dns, hostname in
+                        expected_generate_directives
+                    ]
+                )
+            )
+        )
+
     def test_writes_dns_zone_config(self):
         target_dir = patch_dns_config_path(self)
         domain = factory.make_string()

=== modified file 'src/provisioningserver/dns/zoneconfig.py'
=== modified file 'src/provisioningserver/events.py'
--- src/provisioningserver/events.py	2016-10-25 13:57:02 +0000
+++ src/provisioningserver/events.py	2016-10-26 23:39:26 +0000
@@ -70,6 +70,7 @@
     NODE_COMMISSIONING_EVENT = "NODE_COMMISSIONING_EVENT"
     NODE_COMMISSIONING_EVENT_FAILED = "NODE_COMMISSIONING_EVENT_FAILED"
     NODE_INSTALL_EVENT = "NODE_INSTALL_EVENT"
+<<<<<<< TREE
     NODE_INSTALL_EVENT_FAILED = "NODE_INSTALL_EVENT_FAILED"
     NODE_ENTERING_RESCUE_MODE_EVENT = "NODE_ENTERING_RESCUE_MODE_EVENT"
     NODE_ENTERING_RESCUE_MODE_EVENT_FAILED = (
@@ -77,6 +78,9 @@
     NODE_EXITING_RESCUE_MODE_EVENT = "NODE_EXITING_RESCUE_MODE_EVENT"
     NODE_EXITING_RESCUE_MODE_EVENT_FAILED = (
         "NODE_EXITING_RESCUE_MODE_EVENT_FAILED")
+=======
+    NODE_INSTALL_EVENT_FAILED = "NODE_INSTALL_EVENT_FAILED"
+>>>>>>> MERGE-SOURCE
     # Node user request events
     REQUEST_NODE_START_COMMISSIONING = "REQUEST_NODE_START_COMMISSIONING"
     REQUEST_NODE_ABORT_COMMISSIONING = "REQUEST_NODE_ABORT_COMMISSIONING"
@@ -180,6 +184,7 @@
         description="Node installation",
         level=DEBUG,
     ),
+<<<<<<< TREE
     EVENT_TYPES.NODE_INSTALL_EVENT_FAILED: EventDetail(
         description="Node installation failure",
         level=ERROR,
@@ -200,6 +205,12 @@
         description="Node exiting rescue mode failure",
         level=ERROR,
     ),
+=======
+    EVENT_TYPES.NODE_INSTALL_EVENT_FAILED: EventDetail(
+        description="Node installation failure",
+        level=ERROR,
+    ),
+>>>>>>> MERGE-SOURCE
     EVENT_TYPES.REQUEST_NODE_START_COMMISSIONING: EventDetail(
         description="User starting node commissioning",
         level=INFO,

=== modified file 'src/provisioningserver/import_images/boot_resources.py'
=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
=== modified file 'src/provisioningserver/plugin.py'
--- src/provisioningserver/plugin.py	2016-10-19 17:06:30 +0000
+++ src/provisioningserver/plugin.py	2016-10-26 23:39:26 +0000
@@ -179,10 +179,18 @@
         import crochet
         crochet.no_setup()
 
+<<<<<<< TREE
     def _configureLogging(self, verbosity: int):
         # Get something going with the logs.
         logger.configure(verbosity, logger.LoggingMode.TWISTD)
 
+=======
+    def _configureLogging(self):
+        # Get something going with the logs.
+        from provisioningserver import logger
+        logger.basicConfig()
+
+>>>>>>> MERGE-SOURCE
     def makeService(self, options):
         """Construct the MAAS Cluster service."""
         register_sigusr2_thread_dump_handler()
@@ -190,7 +198,11 @@
         add_patches_to_twisted()
 
         self._configureCrochet()
+<<<<<<< TREE
         self._configureLogging(options["verbosity"])
+=======
+        self._configureLogging()
+>>>>>>> MERGE-SOURCE
 
         with ClusterConfiguration.open() as config:
             tftp_root = config.tftp_root

=== modified file 'src/provisioningserver/power/query.py'
=== modified file 'src/provisioningserver/power/schema.py'
--- src/provisioningserver/power/schema.py	2016-10-20 20:55:30 +0000
+++ src/provisioningserver/power/schema.py	2016-10-26 23:39:26 +0000
@@ -349,6 +349,7 @@
         'description': 'Digital Loggers, Inc. PDU',
         'fields': [
             make_json_field(
+<<<<<<< TREE
                 'outlet_id', "Outlet ID", scope=POWER_PARAMETER_SCOPE.NODE,
                 required=True),
             make_json_field('power_address', "Power address", required=True),
@@ -363,6 +364,11 @@
         'description': "Facebook's Wedge",
         'fields': [
             make_json_field('power_address', "IP address", required=True),
+=======
+                'outlet_id', "Outlet ID", scope=POWER_PARAMETER_SCOPE.NODE,
+                required=True),
+            make_json_field('power_address', "Power address", required=True),
+>>>>>>> MERGE-SOURCE
             make_json_field('power_user', "Power user"),
             make_json_field(
                 'power_pass', "Power password", field_type='password'),

=== modified file 'src/provisioningserver/power/tests/test_query.py'
=== modified file 'src/provisioningserver/rackdservices/tests/test_tftp.py'
=== modified file 'src/provisioningserver/rackdservices/tftp.py'
=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
=== modified file 'src/provisioningserver/templates/commissioning-user-data/snippets/maas_enlist.sh'
=== modified file 'src/provisioningserver/tests/test_plugin.py'
--- src/provisioningserver/tests/test_plugin.py	2016-10-19 21:08:54 +0000
+++ src/provisioningserver/tests/test_plugin.py	2016-10-26 23:39:26 +0000
@@ -81,7 +81,11 @@
         self.useFixture(ClusterConfigurationFixture())
         self.patch(provisioningserver, "services", MultiService())
         self.patch_autospec(crochet, "no_setup")
+<<<<<<< TREE
         self.patch_autospec(logger, "configure")
+=======
+        self.patch_autospec(logger, "basicConfig")
+>>>>>>> MERGE-SOURCE
         self.tempdir = self.make_dir()
 
     def test_init(self):
@@ -108,9 +112,13 @@
             "Not all services are named.")
         self.assertEqual(service, provisioningserver.services)
         self.assertThat(crochet.no_setup, MockCalledOnceWith())
+<<<<<<< TREE
         self.assertThat(
             logger.configure, MockCalledOnceWith(
                 options["verbosity"], logger.LoggingMode.TWISTD))
+=======
+        self.assertThat(logger.basicConfig, MockCalledOnceWith())
+>>>>>>> MERGE-SOURCE
 
     def test_makeService_patches_tftp_service(self):
         mock_tftp_patch = (

=== modified file 'src/provisioningserver/utils/tests/test_env.py'