]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #27070 into master
authorSage Weil <sage@redhat.com>
Fri, 22 Mar 2019 10:07:37 +0000 (05:07 -0500)
committerSage Weil <sage@redhat.com>
Fri, 22 Mar 2019 10:07:37 +0000 (05:07 -0500)
commitb2b08eac17d1ba26dc33a92c015a6f778e9552db
tree6db23962cc984c964140bbe510b6a58ff772be0e
parent2fc26c09127853e78db57920313c598c29f3e671
parent39f4e77d13377763a579f2afcd9341c00ca5b319
Merge PR #27070 into master

* refs/pull/27070/head:
osd/OSDMap: add 'zone' to default crush map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
src/test/crush/crush-choose-args-expected-one-more-3.txt