From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 20 Jan 2021 18:16:12 +0000 (-0800)
Subject: Merge branch 'master' into add-minimal-dispatcher
X-Git-Tag: 1.1.0~17^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1546%2Fhead;p=teuthology.git

Merge branch 'master' into add-minimal-dispatcher
---

7c771155c108def57cfdc8f005294176c5357fc0
diff --cc setup.py
index 71539fd4e,119732e86..87c573a4e
--- a/setup.py
+++ b/setup.py
@@@ -129,7 -130,7 +130,8 @@@ setup
              'teuthology-prune-logs = scripts.prune_logs:main',
              'teuthology-describe = scripts.describe:main',
              'teuthology-reimage = scripts.reimage:main',
-             'teuthology-dispatcher = scripts.dispatcher:main'
++            'teuthology-dispatcher = scripts.dispatcher:main',
+             'teuthology-wait = scripts.wait:main',
              ],
          },