]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
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)
commit0d368d2c8544247a4aed9c71c74e77b0c6bbfb22
tree141e458af01bf11aeada7a9a5a795089092e6858
parent44cd43d57973d392597af1c6f7850693c7a2ef34
parent32b1b0476ad0d6a50d84732ce96cda6ee09f6bec
Merge pull request #14442 from liewegas/wip-midkraken-upgrade

mon/OSDMonitor: tolerate upgrade from post-kraken dev cluster

Reviewed-by: Kefu Chai <kchai@redhat.com>
src/mon/OSDMonitor.cc