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: 8bd90b1 d06b65a)

author	Sage Weil <sage@redhat.com>
	Thu, 20 Dec 2018 12:48:41 +0000 (06:48 -0600)
committer	Sage Weil <sage@redhat.com>
	Thu, 20 Dec 2018 12:48:41 +0000 (06:48 -0600)
commit	49907ea497bf5a18872eed7b57231ec566e3a347
tree	a933276859f28bb6a9ccca7619b68a3776e00adf	tree \| snapshot
parent	8bd90b1d0cc2c16a3a3dfd601ab8946b7fe24cb9	commit \| diff
parent	d06b65a0ab210e7a920761765531d929dd5798ec	commit \| diff

Merge PR #25630 into master

* refs/pull/25630/head:
osd/OSDMap: cancel mapping if target osd is out

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

src/osd/OSDMap.cc

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