diff -Nru python-octaviaclient-2.4.0/ChangeLog python-octaviaclient-2.5.0/ChangeLog
--- python-octaviaclient-2.4.0/ChangeLog	2021-07-15 10:27:16.000000000 +0000
+++ python-octaviaclient-2.5.0/ChangeLog	2022-02-22 11:46:00.000000000 +0000
@@ -1,6 +1,14 @@
 CHANGES
 =======
 
+2.5.0
+-----
+
+* Add support for PROMETHEUS listeners
+* Ignore new pylint checker
+* Add Python3 yoga unit tests
+* Update master for stable/xena
+
 2.4.0
 -----
 
@@ -8,6 +16,7 @@
 * Improve the client performance on large clouds
 * Support pagination for 'list' API calls
 * setup.cfg: Replace dashes with underscores
+* Use py3 as the default runtime for tox
 * Add Python3 xena unit tests
 * Update master for stable/wallaby
 
diff -Nru python-octaviaclient-2.4.0/debian/changelog python-octaviaclient-2.5.0/debian/changelog
--- python-octaviaclient-2.4.0/debian/changelog	2021-07-21 13:38:48.000000000 +0000
+++ python-octaviaclient-2.5.0/debian/changelog	2022-03-02 19:25:03.000000000 +0000
@@ -1,3 +1,9 @@
+python-octaviaclient (2.5.0-0ubuntu1) jammy; urgency=medium
+
+  * New upstream release for OpenStack Yoga.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 02 Mar 2022 14:25:03 -0500
+
 python-octaviaclient (2.4.0-0ubuntu1) impish; urgency=medium
 
   * New upstream release for OpenStack Xena.
diff -Nru python-octaviaclient-2.4.0/octaviaclient/osc/v2/listener.py python-octaviaclient-2.5.0/octaviaclient/osc/v2/listener.py
--- python-octaviaclient-2.4.0/octaviaclient/osc/v2/listener.py	2021-07-15 10:26:46.000000000 +0000
+++ python-octaviaclient-2.5.0/octaviaclient/osc/v2/listener.py	2022-02-22 11:45:28.000000000 +0000
@@ -26,7 +26,8 @@
 from octaviaclient.osc.v2 import utils as v2_utils
 from octaviaclient.osc.v2 import validate
 
-PROTOCOL_CHOICES = ['TCP', 'HTTP', 'HTTPS', 'TERMINATED_HTTPS', 'UDP', 'SCTP']
+PROTOCOL_CHOICES = ['TCP', 'HTTP', 'HTTPS', 'TERMINATED_HTTPS', 'UDP', 'SCTP',
+                    'PROMETHEUS']
 CLIENT_AUTH_CHOICES = ['NONE', 'OPTIONAL', 'MANDATORY']
 
 
diff -Nru python-octaviaclient-2.4.0/PKG-INFO python-octaviaclient-2.5.0/PKG-INFO
--- python-octaviaclient-2.4.0/PKG-INFO	2021-07-15 10:27:17.029564100 +0000
+++ python-octaviaclient-2.5.0/PKG-INFO	2022-02-22 11:46:00.324814600 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: python-octaviaclient
-Version: 2.4.0
+Version: 2.5.0
 Summary: Octavia client for OpenStack Load Balancing
 Home-page: https://docs.openstack.org/python-octaviaclient/latest/
 Author: OpenStack
diff -Nru python-octaviaclient-2.4.0/.pylintrc python-octaviaclient-2.5.0/.pylintrc
--- python-octaviaclient-2.4.0/.pylintrc	2021-07-15 10:26:46.000000000 +0000
+++ python-octaviaclient-2.5.0/.pylintrc	2022-02-22 11:45:28.000000000 +0000
@@ -39,6 +39,7 @@
  invalid-name,
  line-too-long,
  missing-docstring,
+ consider-using-f-string,
 # "R" Refactor recommendations
  duplicate-code,
  interface-not-implemented,
diff -Nru python-octaviaclient-2.4.0/python_octaviaclient.egg-info/pbr.json python-octaviaclient-2.5.0/python_octaviaclient.egg-info/pbr.json
--- python-octaviaclient-2.4.0/python_octaviaclient.egg-info/pbr.json	2021-07-15 10:27:16.000000000 +0000
+++ python-octaviaclient-2.5.0/python_octaviaclient.egg-info/pbr.json	2022-02-22 11:46:00.000000000 +0000
@@ -1 +1 @@
-{"git_version": "6ef3eed", "is_release": true}
\ No newline at end of file
+{"git_version": "d65be0e", "is_release": true}
\ No newline at end of file
diff -Nru python-octaviaclient-2.4.0/python_octaviaclient.egg-info/PKG-INFO python-octaviaclient-2.5.0/python_octaviaclient.egg-info/PKG-INFO
--- python-octaviaclient-2.4.0/python_octaviaclient.egg-info/PKG-INFO	2021-07-15 10:27:16.000000000 +0000
+++ python-octaviaclient-2.5.0/python_octaviaclient.egg-info/PKG-INFO	2022-02-22 11:46:00.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: python-octaviaclient
-Version: 2.4.0
+Version: 2.5.0
 Summary: Octavia client for OpenStack Load Balancing
 Home-page: https://docs.openstack.org/python-octaviaclient/latest/
 Author: OpenStack
diff -Nru python-octaviaclient-2.4.0/python_octaviaclient.egg-info/SOURCES.txt python-octaviaclient-2.5.0/python_octaviaclient.egg-info/SOURCES.txt
--- python-octaviaclient-2.4.0/python_octaviaclient.egg-info/SOURCES.txt	2021-07-15 10:27:17.000000000 +0000
+++ python-octaviaclient-2.5.0/python_octaviaclient.egg-info/SOURCES.txt	2022-02-22 11:46:00.000000000 +0000
@@ -91,6 +91,7 @@
 python_octaviaclient.egg-info/requires.txt
 python_octaviaclient.egg-info/top_level.txt
 releasenotes/notes/.placeholder
+releasenotes/notes/Add-PROMETHEUS-listener-protocol-23f5054f524d9332.yaml
 releasenotes/notes/Add-proxyv2-7a540796c60241c3.yaml
 releasenotes/notes/Add-support-for-UDP-5476caa65b1253a6.yaml
 releasenotes/notes/Add-unset-commands-15490df414a70df0.yaml
@@ -145,6 +146,7 @@
 releasenotes/source/ussuri.rst
 releasenotes/source/victoria.rst
 releasenotes/source/wallaby.rst
+releasenotes/source/xena.rst
 releasenotes/source/_static/.placeholder
 releasenotes/source/_templates/.placeholder
 tools/coding-checks.sh
diff -Nru python-octaviaclient-2.4.0/releasenotes/notes/Add-PROMETHEUS-listener-protocol-23f5054f524d9332.yaml python-octaviaclient-2.5.0/releasenotes/notes/Add-PROMETHEUS-listener-protocol-23f5054f524d9332.yaml
--- python-octaviaclient-2.4.0/releasenotes/notes/Add-PROMETHEUS-listener-protocol-23f5054f524d9332.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-octaviaclient-2.5.0/releasenotes/notes/Add-PROMETHEUS-listener-protocol-23f5054f524d9332.yaml	2022-02-22 11:45:28.000000000 +0000
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Added support for the PROMETHEUS listener protocol.
diff -Nru python-octaviaclient-2.4.0/releasenotes/source/index.rst python-octaviaclient-2.5.0/releasenotes/source/index.rst
--- python-octaviaclient-2.4.0/releasenotes/source/index.rst	2021-07-15 10:26:46.000000000 +0000
+++ python-octaviaclient-2.5.0/releasenotes/source/index.rst	2022-02-22 11:45:28.000000000 +0000
@@ -6,6 +6,7 @@
    :maxdepth: 1
 
    unreleased
+   xena
    wallaby
    victoria
    ussuri
diff -Nru python-octaviaclient-2.4.0/releasenotes/source/xena.rst python-octaviaclient-2.5.0/releasenotes/source/xena.rst
--- python-octaviaclient-2.4.0/releasenotes/source/xena.rst	1970-01-01 00:00:00.000000000 +0000
+++ python-octaviaclient-2.5.0/releasenotes/source/xena.rst	2022-02-22 11:45:28.000000000 +0000
@@ -0,0 +1,6 @@
+=========================
+Xena Series Release Notes
+=========================
+
+.. release-notes::
+   :branch: stable/xena
diff -Nru python-octaviaclient-2.4.0/tox.ini python-octaviaclient-2.5.0/tox.ini
--- python-octaviaclient-2.4.0/tox.ini	2021-07-15 10:26:46.000000000 +0000
+++ python-octaviaclient-2.5.0/tox.ini	2022-02-22 11:45:28.000000000 +0000
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.5.0
-envlist = py37,pep8
+envlist = py3,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
diff -Nru python-octaviaclient-2.4.0/zuul.d/projects.yaml python-octaviaclient-2.5.0/zuul.d/projects.yaml
--- python-octaviaclient-2.4.0/zuul.d/projects.yaml	2021-07-15 10:26:46.000000000 +0000
+++ python-octaviaclient-2.5.0/zuul.d/projects.yaml	2022-02-22 11:45:28.000000000 +0000
@@ -3,7 +3,7 @@
       - check-requirements
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
-      - openstack-python3-xena-jobs
+      - openstack-python3-yoga-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3