From: Patrick Donnelly Date: Mon, 14 Jan 2019 19:32:01 +0000 (-0800) Subject: Merge PR #25633 into master X-Git-Tag: v14.1.0~399 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2b05b833484eb61d94d05d64e8bc749f1bfe374;p=ceph.git Merge PR #25633 into master * refs/pull/25633/head: mgr/rook: allow service describe and service ls to display nfs services mgr/rook: add support for adding NFS gateways mgr/orchestrator_cli: add support for adding NFS gateways mgr/orchestrator_cli: convert service add/rm commands to be type-specific mgr/rook: add decorator for add_stateless_service mgr/rook: add a context manager instead of open-coding exception handling Reviewed-by: Ricardo Dias Reviewed-by: Patrick Donnelly Reviewed-by: Sebastian Wagner --- a2b05b833484eb61d94d05d64e8bc749f1bfe374