diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-13 06:57:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-13 06:57:19 +0000 |
| commit | d6fa3847cc64f6815641cdb549dd100e1aab6043 (patch) | |
| tree | 00f71f27d1e9822200b6fbf1f6c26d8ccabe3d41 /openstack/common | |
| parent | ff8f185ff27c45b3463357ef7c2773bd547f1323 (diff) | |
| parent | 763802c08365fc3c4c69a8a670a0c39e63eb82ec (diff) | |
| download | oslo-d6fa3847cc64f6815641cdb549dd100e1aab6043.tar.gz oslo-d6fa3847cc64f6815641cdb549dd100e1aab6043.tar.xz oslo-d6fa3847cc64f6815641cdb549dd100e1aab6043.zip | |
Merge "threadgroup : greethread.cancel() should be kill()"
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/threadgroup.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/threadgroup.py b/openstack/common/threadgroup.py index f501889..f6fe50e 100644 --- a/openstack/common/threadgroup.py +++ b/openstack/common/threadgroup.py @@ -47,7 +47,7 @@ class Thread(object): self.thread.link(_thread_done, group=group, thread=self) def stop(self): - self.thread.cancel() + self.thread.kill() def wait(self): return self.thread.wait() |