]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44cd43d 32b1b04)
Merge pull request #14442 from liewegas/wip-midkraken-upgrade
authorSage Weil <sage@newdream.net>
Sun, 23 Apr 2017 20:47:28 +0000 (15:47 -0500)
committerGitHub <noreply@github.com>
Sun, 23 Apr 2017 20:47:28 +0000 (15:47 -0500)
mon/OSDMonitor: tolerate upgrade from post-kraken dev cluster

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

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