diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-21 12:33:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-21 12:33:29 +0000 |
| commit | feb72de7b81e3919dedc697f9fb5484a92f85ad8 (patch) | |
| tree | 054364fe9a27043b2f1937eb0473b138671ef1fb | |
| parent | ca939fc0e4683efce87b567a9a074063a9c75b4f (diff) | |
| parent | d24edef117a356a473247db35a020a1f2c68f9ae (diff) | |
| download | oslo-messaging-feb72de7b81e3919dedc697f9fb5484a92f85ad8.tar.gz | |
Merge "Remove deprecation of heartbeat_in_pthread"12.11.0
| -rw-r--r-- | oslo_messaging/_drivers/impl_rabbit.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 6c6f20c..20e30ad 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -84,7 +84,7 @@ rabbit_opts = [ "example if the parent process has monkey patched the " "stdlib by using eventlet/greenlet then the heartbeat " "will be run through a green thread.", - deprecated_for_removal=True), + ), cfg.FloatOpt('kombu_reconnect_delay', default=1.0, deprecated_group='DEFAULT', diff --git a/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml b/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml new file mode 100644 index 0000000..4c71b9f --- /dev/null +++ b/releasenotes/notes/undeprecate_heartbeat_in_pthread-48e2c1fc008cf208.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + We undeprecated the ``heartbeat_in_pthread`` option. This option will + remain available to allow customers to run the rabbitmq heartbeat in + python thread or not. |