Merge remote-tracking branch 'upstream/2017.7.9' into 2017.7

saltstack · May 9, 2019 · 008bd69 · 008bd69
2 parents 9ab4352 + 34e9f2e
commit 008bd69
Show file tree

Hide file tree

Showing 34 changed files with 249 additions and 618 deletions.
diff --git a/.ci/kitchen-ubuntu1404-py2 b/.ci/kitchen-ubuntu1404-py2
diff --git a/requirements/static/arch.in b/requirements/static/arch.in
@@ -16,7 +16,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/centos-6.in b/requirements/static/centos-6.in
@@ -18,7 +18,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/centos-7.in b/requirements/static/centos-7.in
@@ -18,7 +18,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/debian-8.in b/requirements/static/debian-8.in
@@ -19,7 +19,7 @@ moto
 msgpack-python >= 0.4.2, != 0.5.5
 paramiko==2.1.2
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/debian-9.in b/requirements/static/debian-9.in
@@ -19,7 +19,7 @@ moto
 msgpack-python >= 0.4.2, != 0.5.5
 paramiko==2.1.2
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/fedora-28.in b/requirements/static/fedora-28.in
@@ -18,7 +18,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/fedora-29.in b/requirements/static/fedora-29.in
@@ -17,10 +17,10 @@ mock<1.1.0
 more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+psutil
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
-psutil
 pyinotify
 pyopenssl
 python-etcd==0.4.2

diff --git a/requirements/static/opensuse-42.in b/requirements/static/opensuse-42.in
@@ -18,7 +18,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/opensuse-leap-15.in b/requirements/static/opensuse-leap-15.in
@@ -18,7 +18,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pyinotify

diff --git a/requirements/static/osx.in b/requirements/static/osx.in
@@ -19,7 +19,7 @@ more-itertools==5.0.0
 moto
 msgpack-python >= 0.4.2, != 0.5.5
 psutil
-# Let's install cryptodome instead of pycrupto because of it's ourstanding security issues
+# Let's install cryptodome instead of pycrypto because of pycrypto's outstanding security issues
 # PyCrypto, if pulled, will be removed from the generated static requirements
 pycryptodome
 pylxd>=2.2.5

diff --git a/requirements/static/py2.7/raet-ubuntu-14.04.txt b/requirements/static/py2.7/raet-ubuntu-14.04.txt