]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23412 into master
authorSage Weil <sage@redhat.com>
Tue, 7 Aug 2018 13:53:51 +0000 (08:53 -0500)
committerSage Weil <sage@redhat.com>
Tue, 7 Aug 2018 13:53:51 +0000 (08:53 -0500)
* refs/pull/23412/head:
mgr: add Orchestrator.available method + CLI
doc: add general documentation on orchestrator
doc: add page for Rook module
doc: add development guide for Ceph+Rook in k8s
script: add kubejacker script
mgr/rook: Rook orchestrator module
mgr/orchestrator_cli: module for calling into orchestators
mgr: introduce `orchestrator` python interface

Reviewed-by: Sage Weil <sage@redhat.com>

Trivial merge