Merge ~freyes/ubuntu/+source/horizon:stable/xena into ~ubuntu-openstack-dev/ubuntu/+source/horizon:stable/xena

[Felipe Reyes]

diff --git a/ChangeLog b/ChangeLog
index 004afbd..81dfab1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 CHANGES
 =======
 
+20.1.1
+------
+
+* Fix maximum recursion depth error when generating documentation
+* Update TOX\_CONSTRAINTS\_FILE for stable/xena
+* Update .gitreview for stable/xena
+
 20.1.0
 ------
 
diff --git a/PKG-INFO b/PKG-INFO
index 45a6e6b..da5f39e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: horizon
-Version: 20.1.0
+Version: 20.1.1
 Summary: OpenStack Dashboard
 Home-page: https://docs.openstack.org/horizon/latest/
 Author: OpenStack
diff --git a/debian/changelog b/debian/changelog
index 97c8591..752f582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-horizon (4:20.1.0-0ubuntu1.1) UNRELEASED; urgency=medium
+horizon (4:20.1.1-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Corey Bryant ]
   * d/gbp.conf: Create stable/xena branch.
 
- -- Corey Bryant <[e-mail]>  Fri, 15 Oct 2021 15:00:01 -0400
+  [ Felipe Reyes ]
+  * New stable point release for OpenStack Xena (LP: #1962582).
+
+ -- Felipe Reyes <[e-mail]>  Mon, 28 Feb 2022 22:29:03 +0000
 
 horizon (4:20.1.0-0ubuntu1) impish; urgency=medium
 
diff --git a/horizon.egg-info/PKG-INFO b/horizon.egg-info/PKG-INFO
index 45a6e6b..da5f39e 100644
--- a/horizon.egg-info/PKG-INFO
+++ b/horizon.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: horizon
-Version: 20.1.0
+Version: 20.1.1
 Summary: OpenStack Dashboard
 Home-page: https://docs.openstack.org/horizon/latest/
 Author: OpenStack
diff --git a/horizon.egg-info/SOURCES.txt b/horizon.egg-info/SOURCES.txt
index 8e95719..05d49f1 100644
--- a/horizon.egg-info/SOURCES.txt
+++ b/horizon.egg-info/SOURCES.txt
@@ -181,7 +181,6 @@ horizon.egg-info/SOURCES.txt
 horizon.egg-info/dependency_links.txt
 horizon.egg-info/entry_points.txt
 horizon.egg-info/not-zip-safe
-horizon.egg-info/pbr.json
 horizon.egg-info/requires.txt
 horizon.egg-info/top_level.txt
 horizon/browsers/__init__.py
diff --git a/horizon.egg-info/pbr.json b/horizon.egg-info/pbr.json
deleted file mode 100644
index 21f35d1..0000000
--- a/horizon.egg-info/pbr.json
+++ /dev/null
@@ -1 +0,0 @@
-{"git_version": "a20c4f6f2", "is_release": true}
\ No newline at end of file
diff --git a/horizon/tables/actions.py b/horizon/tables/actions.py
index 25c4523..ad8945a 100644
--- a/horizon/tables/actions.py
+++ b/horizon/tables/actions.py
@@ -52,7 +52,10 @@ class BaseActionMetaClass(type):
         # Options of action are set as class attributes, loading them.
         options = {}
         if attrs:
-            options = attrs
+            # NOTE: It is required to create a new dict object
+            # to avoid a recursive reference when no parent class
+            # has 'base_options' attribute.
+            options = dict(attrs)
 
         # Iterate in reverse to preserve final order
         for base in bases[::-1]:
diff --git a/tox.ini b/tox.ini
index 4e6e7dc..5d6ad5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ whitelist_externals =
   bash
   find
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
   # Unit test for a local hacking rule requires hacking.
@@ -138,7 +138,7 @@ commands =
 [testenv:docs]
 # We need to install horizon dependecies to build module references
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =