...
 
Commits (3)
salt (2018.3.4+dfsg1-2) unstable; urgency=medium
* Fix test_xen_virtual on kernels with no Xen support (Closes: #922352)
* Expose tornado4 as tornado for zmq.eventloop.ioloop (Closes: #924763)
-- Benjamin Drung <benjamin.drung@cloud.ionos.com> Wed, 17 Apr 2019 20:26:11 +0200
salt (2018.3.4+dfsg1-1) unstable; urgency=medium
* New upstream release.
......
......@@ -21,7 +21,7 @@ Subject: [PATCH 3/3] Use renamed python3-tornado4
salt/transport/ipc.py | 23 +++++++++++-----
salt/transport/mixins/auth.py | 5 +++-
salt/transport/tcp.py | 26 +++++++++++++------
salt/transport/zeromq.py | 11 +++++---
salt/transport/zeromq.py | 20 +++++++++-----
salt/utils/asynchronous.py | 8 ++++--
salt/utils/event.py | 8 ++++--
salt/utils/gitfs.py | 5 +++-
......@@ -41,11 +41,11 @@ Subject: [PATCH 3/3] Use renamed python3-tornado4
tests/unit/test_minion.py | 18 +++++++++----
tests/unit/transport/test_ipc.py | 11 +++++---
tests/unit/transport/test_tcp.py | 14 +++++++---
tests/unit/transport/test_zeromq.py | 8 ++++--
tests/unit/transport/test_zeromq.py | 13 ++++++++--
tests/unit/utils/test_asynchronous.py | 11 +++++---
tests/unit/utils/test_context.py | 11 +++++---
tests/unit/utils/test_event.py | 5 +++-
41 files changed, 303 insertions(+), 104 deletions(-)
41 files changed, 314 insertions(+), 107 deletions(-)
diff --git a/doc/conf.py b/doc/conf.py
index 23d3442c16..720026b823 100644
......@@ -454,7 +454,17 @@ diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
index 999197ba3a..cd1588e1cc 100644
--- a/salt/transport/zeromq.py
+++ b/salt/transport/zeromq.py
@@ -47,9 +47,14 @@ except ImportError:
@@ -36,9 +36,6 @@ from salt.exceptions import SaltReqTimeoutError
from salt._compat import ipaddress
from salt.utils.zeromq import zmq, ZMQDefaultLoop, install_zmq, ZMQ_VERSION_INFO, LIBZMQ_VERSION_INFO
-import zmq.error
-import zmq.eventloop.ioloop
-import zmq.eventloop.zmqstream
try:
import zmq.utils.monitor
@@ -47,9 +44,20 @@ except ImportError:
HAS_ZMQ_MONITOR = False
# Import Tornado Libs
......@@ -465,10 +475,16 @@ index 999197ba3a..cd1588e1cc 100644
+ import tornado4
+ import tornado4.gen as tornado_gen
+ from tornado4.concurrent import Future as TornadoFuture
+ # Expose tornado4 as tornado for zmq.eventloop.ioloop
+ sys.modules['tornado'] = tornado4
+except ImportError:
+ import tornado
+ import tornado.gen as tornado_gen
+ from tornado.concurrent import Future as TornadoFuture
+
+import zmq.error
+import zmq.eventloop.ioloop
+import zmq.eventloop.zmqstream
# Import third party libs
try:
......@@ -863,21 +879,30 @@ index 84546128d5..8a9e2dac31 100644
import salt.config
from salt.ext import six
diff --git a/tests/unit/transport/test_zeromq.py b/tests/unit/transport/test_zeromq.py
index 798ab0c6c6..4af9cd4547 100644
index 798ab0c6c6..3846c30cb3 100644
--- a/tests/unit/transport/test_zeromq.py
+++ b/tests/unit/transport/test_zeromq.py
@@ -23,8 +23,12 @@ import zmq.eventloop.ioloop
# support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x
if not hasattr(zmq.eventloop.ioloop, 'ZMQIOLoop'):
zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop
-from tornado.testing import AsyncTestCase
-import tornado.gen as tornado_gen
@@ -19,12 +19,21 @@ except ImportError:
from distro import linux_distribution
# Import 3rd-party libs
+try:
+ import tornado4
+ from tornado4.testing import AsyncTestCase
+ import tornado4.gen as tornado_gen
+ # Expose tornado4 as tornado for zmq.eventloop.ioloop
+ import sys
+ sys.modules['tornado'] = tornado4
+except ImportError:
+ from tornado.testing import AsyncTestCase
+ import tornado.gen as tornado_gen
+
import zmq.eventloop.ioloop
# support pyzmq 13.0.x, TODO: remove once we force people to 14.0.x
if not hasattr(zmq.eventloop.ioloop, 'ZMQIOLoop'):
zmq.eventloop.ioloop.ZMQIOLoop = zmq.eventloop.ioloop.IOLoop
-from tornado.testing import AsyncTestCase
-import tornado.gen as tornado_gen
# Import Salt libs
import salt.config
......
......@@ -4017,3 +4017,42 @@ index 29b3fe893f..88c1457843 100644
"edit": False,
"type": "size",
"values": "<size>"
diff --git a/doc/topics/releases/2017.7.0.rst b/doc/topics/releases/2017.7.0.rst
index d83031dcfa..a53bf246a4 100644
--- a/doc/topics/releases/2017.7.0.rst
+++ b/doc/topics/releases/2017.7.0.rst
@@ -441,7 +441,7 @@ have been improved, enhanced and widenened in scope:
the process. In 2017.7.0 we have introduced the functionality to re-establish
the connection. One can disable this feature through the
:conf_proxy:`proxy_keep_alive` option and adjust the polling frequency
- speciying a custom value for :conf_proxy:`proxy_keep_alive_interval`,
+ specifying a custom value for :conf_proxy:`proxy_keep_alive_interval`,
in minutes.
New modules:
diff --git a/salt/states/boto_ec2.py b/salt/states/boto_ec2.py
index 6623c5f522..d00e54e810 100644
--- a/salt/states/boto_ec2.py
+++ b/salt/states/boto_ec2.py
@@ -748,7 +748,7 @@ def instance_present(name, instance_name=None, instance_id=None, image_id=None,
a public_ip instead.
allocate_eip:
(bool) - Allocate and attach an EIP on-the-fly for this instance. Note
- you'll want to releaase this address when terminating the instance,
+ you'll want to release this address when terminating the instance,
either manually or via the 'release_eip' flag to 'instance_absent'.
region
(string) - Region to connect to.
diff --git a/salt/states/network.py b/salt/states/network.py
index ec3c2fd8ed..129ef5b0eb 100644
--- a/salt/states/network.py
+++ b/salt/states/network.py
@@ -140,7 +140,7 @@ all interfaces are ignored unless specified.
- type: eth
- proto: dhcp
- noifupdown: True # Do not restart the interface
- # you need to reboot/reconfigure manualy
+ # you need to reboot/reconfigure manually
bond0:
network.managed: