From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 30 Apr 2018 13:48:37 +0000 (+0800)
Subject: Merge pull request #21659 from yangDL/master
X-Git-Tag: v13.1.0~46
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ceaf32981132b124388fdcbf36992fc2d01f4fb3;p=ceph.git

Merge pull request #21659 from yangDL/master

pybind/ceph_argparse.py:'timeout' must in kwargs when call run_in_thread

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

ceaf32981132b124388fdcbf36992fc2d01f4fb3