From: Sage Weil <sage@newdream.net>
Date: Tue, 16 May 2017 13:43:18 +0000 (-0500)
Subject: Merge pull request #15112 from jcsp/wip-19940
X-Git-Tag: v12.1.0~10^2~114
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=035c3984872efe6955f41fc148650cd6d3ccd934;p=ceph.git

Merge pull request #15112 from jcsp/wip-19940

ceph-create-keys: update client.admin if it already exists

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

035c3984872efe6955f41fc148650cd6d3ccd934