From: Sage Weil <sage@redhat.com>
Date: Fri, 4 Jan 2019 02:38:14 +0000 (-0600)
Subject: Merge PR #25623 into master
X-Git-Tag: v14.1.0~496
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8917a153f432901edd96841b52f29c161eb3ac1e;p=ceph.git

Merge PR #25623 into master

* refs/pull/25623/head:
	common/ceph_time: 'mo' for month
	common/options: use new parse_timespan
	common/ceph_time: add parse_timespan
	common/config_proxy: pass err_ss through on set_val
	common/ceph_time: add exact_timespan_str

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

8917a153f432901edd96841b52f29c161eb3ac1e