]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b2b885 a1613e6)
Merge PR #25823 into master
authorSage Weil <sage@redhat.com>
Tue, 8 Jan 2019 19:05:11 +0000 (13:05 -0600)
committerSage Weil <sage@redhat.com>
Tue, 8 Jan 2019 19:05:11 +0000 (13:05 -0600)
* refs/pull/25823/head:
msg/async/Protocol*: fix mark_down vs accept race

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

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