]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #14608 from tchaikov/wip-19594 14630/head
authorKefu Chai <tchaikov@gmail.com>
Thu, 20 Apr 2017 02:49:12 +0000 (10:49 +0800)
committerGitHub <noreply@github.com>
Thu, 20 Apr 2017 02:49:12 +0000 (10:49 +0800)
qa/tasks: assert on pg status with a timeout

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
qa/tasks/ceph_manager.py
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h

Simple merge
Simple merge
Simple merge