]> 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: 00c30dd 1265603)
Merge pull request #3281 from ceph/wip-10441-b
authorSamuel Just <sam.just@inktank.com>
Tue, 13 Jan 2015 18:55:29 +0000 (10:55 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 13 Jan 2015 18:55:29 +0000 (10:55 -0800)
osd: fix watch ordering bug 10441 option b

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/osd/OSD.cc patch | diff1 | diff2 | blob | history
src/osd/ReplicatedPG.cc patch | diff1 | diff2 | blob | history

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