From bdde47c9d617ae3b96b648162abf914ca06fafd8 Mon Sep 17 00:00:00 2001
From: Landon Sterk <landon@yelp.com>
Date: Fri, 22 Jan 2021 18:11:38 -0800
Subject: [PATCH 1/2] #146 lower pin for features on paramiko; relax upper pin
 to use newer versions

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ace2f628..04273744 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@
         "PyYAML>3.10",
         "pytz>=2014.1",
         "requests-futures>0.9.0",
-        "paramiko<2.5.0",
+        "paramiko>1.8.0,<3.0.0",
         "requests<3.0.0",
         "retrying",
         "six>=1.10.0",

From f3aac4dfe89e888dbb5a64da3b4cc66399c27c15 Mon Sep 17 00:00:00 2001
From: Landon Sterk <landon@yelp.com>
Date: Fri, 29 Jan 2021 10:12:11 -0800
Subject: [PATCH 2/2] Clarify how the acceptance tests are run and remove
 unused targets

---
 tox_acceptance.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tox_acceptance.ini b/tox_acceptance.ini
index a3b3567a..de8b9bbe 100644
--- a/tox_acceptance.ini
+++ b/tox_acceptance.ini
@@ -1,5 +1,7 @@
+# this file is run via a Docker container
+# see docker/itest/run_tests.sh for more details
 [tox]
-envlist = py{27,36}-unittest, py{27,36}-kafka{10,11}-dockeritest
+envlist = py{27,36}-kafka{10,11}-dockeritest
 tox_pip_extensions_ext_pip_custom_platform = true
 tox_pip_extensions_ext_venv_update = true
 distdir = {toxworkdir}/dist_acceptance