Merge "Octavia projects RC2"

deliverables/queens/neutron-lbaas.yaml

@@ -26,9 +26,10 @@ branches:
   - location: 12.0.0.0rc1
     name: stable/queens
 cycle-highlights:
-  - 'The neutron-lbaas and neutron-lbaas-dashboard projects are now deprecated. Please
+  - 'The neutron-lbaas and neutron-lbaas-dashboard projects are now deprecated.
-    see the FAQ at https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation'
+    Please see the FAQ at
-  - 'Neutron-lbaas now includes a proxy plugin that forwards all API requests to the
+    https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation'
-    Octavia API.'
+  - 'Neutron-lbaas now includes a proxy plugin that forwards all API requests
+    to the Octavia API.'
 repository-settings:
   openstack/neutron-lbaas: {}

deliverables/queens/octavia-dashboard.yaml

@@ -23,12 +23,16 @@ releases:
       - hash: eff100522a7ad5904db95468199489656c894727
         repo: openstack/octavia-dashboard
     version: 1.0.0.0rc1
+  - projects:
+      - hash: 03666efc505b931c3f0b7473dd18782548c13da8
+        repo: openstack/octavia-dashboard
+    version: 1.0.0.0rc2
 branches:
   - location: 1.0.0.0rc1
     name: stable/queens
 cycle-highlights:
-  - 'The initial release of the Octavia dashboard for Horizon includes significantly
+  - 'The initial release of the Octavia dashboard for Horizon includes
-    improved load balancer detail pages and workflows compared to the, now deprecated,
+    significantly improved load balancer detail pages and workflows compared
-    neutron-lbaas-dashboard.'
+    to the, now deprecated, neutron-lbaas-dashboard.'
 repository-settings:
   openstack/octavia-dashboard: {}

deliverables/queens/octavia.yaml

@@ -23,13 +23,18 @@ releases:
       - hash: 0146961653f5f09f32d7186c6c7d67cddc7627c0
         repo: openstack/octavia
     version: 2.0.0.0rc1
+  - projects:
+      - hash: 08387c78c897c97aad72f3eb6ae0702fbc9a3058
+        repo: openstack/octavia
+    version: 2.0.0.0rc2
 branches:
   - location: 2.0.0.0rc1
     name: stable/queens
 cycle-highlights:
   - 'Added the ability to batch update pool members.'
-  - 'A Neutron Quality of Service (QoS) policy can now be applied to Octavia load
+  - 'A Neutron Quality of Service (QoS) policy can now be applied to Octavia
-    balancers.'
+    load balancers.'
-  - 'Octavia now supports using Castellan and PKCS12 bundles for TLS termination.'
+  - 'Octavia now supports using Castellan and PKCS12 bundles for TLS
+    termination.'
 repository-settings:
   openstack/octavia: {}

deliverables/queens/python-octaviaclient.yaml

@@ -18,7 +18,8 @@ releases:
       - repo: openstack/python-octaviaclient
         hash: 830e49fb0528718e8c6cea0e0828248849044133
 cycle-highlights:
-  - 'The Octavia OpenStack client plugin now supports quotas, load balancer QoS policies,
+  - 'The Octavia OpenStack client plugin now supports quotas, load balancer
-    load balancer failover, listener statistics, and filtering by load balancer ID.'
+    QoS policies, load balancer failover, listener statistics, and filtering
+    by load balancer ID.'
 repository-settings:
   openstack/python-octaviaclient: {}