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: 3163af3 d47386c)

author	Sage Weil <sage@redhat.com>
	Tue, 3 Sep 2019 14:19:21 +0000 (09:19 -0500)
committer	Sage Weil <sage@redhat.com>
	Tue, 3 Sep 2019 14:19:21 +0000 (09:19 -0500)
commit	6e2c9269a06a6e6a57111a2e388b688b63b02828
tree	83c4d5ac8c3908777043b58847acbe1976fb4f4f	tree \| snapshot
parent	3163af3296cc51f4b88b2f43ddd92546bfdf593a	commit \| diff
parent	d47386c3145d3d4c4ace630ce7b48e552c5f2a5a	commit \| diff

Merge PR #29835 into master

* refs/pull/29835/head:
osd/PeeringState: fix wrong history of merge target

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

src/osd/PeeringState.cc

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