From: Sebastian Wagner Date: Wed, 12 Dec 2018 14:55:56 +0000 (+0100) Subject: Merge pull request #25452 from jtlayton/wip-orchestrator X-Git-Tag: v14.1.0~645 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b9663ba5a7d8b5e0c9ca81d5564cfbe85f60be42;p=ceph.git Merge pull request #25452 from jtlayton/wip-orchestrator mgr/rook: fix API version and object types for recent rook changes Reviewed-by: Sebastian Wagner --- b9663ba5a7d8b5e0c9ca81d5564cfbe85f60be42