From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 26 Jan 2017 23:14:45 +0000 (-0800)
Subject: Merge pull request #12934 from athanatos/wip-18529
X-Git-Tag: v12.0.0~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ebea511ed05e6ba1591b253721a82475eedcb7c;p=ceph.git

Merge pull request #12934 from athanatos/wip-18529

test/pybind/test_rados.py: tolerate TimedOut in test_ping_monitor

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

2ebea511ed05e6ba1591b253721a82475eedcb7c