]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c720e34 43e677d)
Merge pull request #12934 from athanatos/wip-18529
authorJosh Durgin <jdurgin@redhat.com>
Thu, 26 Jan 2017 23:14:45 +0000 (15:14 -0800)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2017 23:14:45 +0000 (15:14 -0800)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.