]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3664ca0 8f23f2c)
Merge PR #32365 into master
authorSage Weil <sage@redhat.com>
Tue, 28 Jan 2020 20:08:51 +0000 (14:08 -0600)
committerSage Weil <sage@redhat.com>
Tue, 28 Jan 2020 20:08:51 +0000 (14:08 -0600)
* refs/pull/32365/head:
mon: Don't put session during feature change

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mon/Monitor.cc patch | diff1 | diff2 | blob | history

diff --cc src/mon/Monitor.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.