]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #5686 from liewegas/wip-hammer-feature
authorSage Weil <sage@redhat.com>
Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
committerSage Weil <sage@redhat.com>
Sun, 13 Sep 2015 11:41:56 +0000 (07:41 -0400)
commite73ac661a4c81ccf006f658154d73be4cb1c8133
tree5b8f1e44948c250d6a6a4c17cda5747c9f967a4a
parenta511c245478eff1fea74b4313ef472af8c436f83
parent38465f0d7065c41070eab6b2326f8a1f0b8de332
Merge pull request #5686 from liewegas/wip-hammer-feature

require osds are hammer v0.94.4 or later before upgrading past hammer

Reviewed-by: Loic Dachary <ldachary@redhat.com>
src/mon/OSDMonitor.cc
src/osd/OSD.cc