Merge "drain runner queue and undo cancel_join_thread"
authorRoss Brattain <ross.b.brattain@intel.com>
Mon, 2 Oct 2017 15:16:54 +0000 (15:16 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 2 Oct 2017 15:16:54 +0000 (15:16 +0000)

Trivial merge