]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #25623 into master
authorSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 02:38:14 +0000 (20:38 -0600)
committerSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 02:38:14 +0000 (20:38 -0600)
* 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>
1  2 
src/common/config_proxy.h
src/common/options.cc

Simple merge
Simple merge