From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Mar 2020 02:55:39 +0000 (-0500)
Subject: Merge PR #33932 into octopus
X-Git-Tag: v15.1.1~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c36406a91bf4b9aba744da33b0790a0a11fba6b3;p=ceph.git

Merge PR #33932 into octopus

* refs/pull/33932/head:
	cephadm: fix datetime regexp to capture at most 6 digits

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

c36406a91bf4b9aba744da33b0790a0a11fba6b3