]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ad9716 6a4734a)
Merge pull request #5825 from tchaikov/wip-12848-hammer
authorLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 19:23:23 +0000 (20:23 +0100)
committerLoic Dachary <loic@dachary.org>
Tue, 10 Nov 2015 19:23:23 +0000 (20:23 +0100)
ReplicatedPG::hit_set_trim osd/ReplicatedPG.cc: 11006: FAILED assert(obc)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
1  2 
src/common/config_opts.h patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.