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: ad88d4d 72d6426)

author	Sage Weil <sage@redhat.com>
	Thu, 8 Aug 2019 20:49:17 +0000 (15:49 -0500)
committer	Sage Weil <sage@redhat.com>
	Thu, 8 Aug 2019 20:49:17 +0000 (15:49 -0500)
commit	01fcf0e401478fd1e13703a4c450f12e29b8e1f5
tree	8081023bf4448f91a3e330a298935289d05fe8b5	tree \| snapshot
parent	ad88d4dced51ee3ede5a8ba906e2d4d5c93b2bba	commit \| diff
parent	72d64260259f958587d15f717499735a0c4ea219	commit \| diff

Merge PR #29517 into master

* refs/pull/29517/head:
osd: include PastInterals in pg_notify_t

Reviewed-by: Samuel Just <sjust@redhat.com>

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

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