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

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

projects / ceph-ci.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7842ea1 431735b)

author	David Zafman <dzafman@redhat.com>
	Fri, 28 Oct 2016 18:17:12 +0000 (11:17 -0700)
committer	GitHub <noreply@github.com>
	Fri, 28 Oct 2016 18:17:12 +0000 (11:17 -0700)
commit	d22d6ca649b5f9e8cc9f1235371383a09bf9bc1e
tree	c2de5a56fd4ec3e354b8f3fc51e8fc9b8cd7a00d	tree \| snapshot
parent	7842ea170d38d7ff0d21b75c533777599e37a8d8	commit \| diff
parent	431735bcbbcb7f42625b19a822495235ae21e39c	commit \| diff

Merge pull request #11397 from dzafman/wip-scrub-misc

Reviewed-by: Kefu Chai <kchai@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/ReplicatedBackend.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	diff1 \|	diff2 \|	blob \| history

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