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

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

projects / ceph.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1de3820 b7e7799)

author	Sage Weil <sage@newdream.net>
	Thu, 4 May 2017 02:37:39 +0000 (21:37 -0500)
committer	GitHub <noreply@github.com>
	Thu, 4 May 2017 02:37:39 +0000 (21:37 -0500)
commit	7e79a4eadc1325d0389e49bc6425915b78fa533e
tree	5ab3ce751f66a6ba159986b283924da647b6db41	tree \| snapshot
parent	1de3820063e3aae331156bb2a5bd1b88c0d541f6	commit \| diff
parent	b7e77996586daa46da6be0bfbb8c2b93e203a83a	commit \| diff

Merge pull request #14627 from badone/wip-peering-state-timing

osd: Implement peering state timing

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

src/osd/OSD.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	diff1 \|	diff2 \|	blob \| history

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