git.apps.os.sepia.ceph.com Git - ceph.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 535b2cf cc61bb8)

author	Kefu Chai <tchaikov@gmail.com>
	Thu, 20 Apr 2017 02:49:12 +0000 (10:49 +0800)
committer	GitHub <noreply@github.com>
	Thu, 20 Apr 2017 02:49:12 +0000 (10:49 +0800)
commit	ee653ba87c145cc4be7abbf80a4accbf2ae786a5
tree	860b99cf2c09895c2e2f9a7fe830e8ffcb5c801f	tree \| snapshot
parent	535b2cff57a715c1d1b2ced79183812706c3a34d	commit \| diff
parent	cc61bb878faa2ac745d4f9e4c63ef22eb9d9dd7a	commit \| diff

Merge pull request #14608 from tchaikov/wip-19594

qa/tasks: assert on pg status with a timeout

Reviewed-by: Sage Weil <sage@redhat.com>

qa/tasks/ceph_manager.py	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.h	diff1 \|	diff2 \|	blob \| history

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