diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-30 11:02:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-30 11:02:35 +0000 |
| commit | 7e2805025d86220df0678110df933745a46db178 (patch) | |
| tree | a645cf653e190ba246305ba0a5bcb7faf77e1d2d /openstack/common/timeutils.py | |
| parent | 95da21822653c878973bd267eea36b9683040d6d (diff) | |
| parent | 484a1df32d5854312ef31c5b488fc07fff8428c4 (diff) | |
| download | oslo-7e2805025d86220df0678110df933745a46db178.tar.gz oslo-7e2805025d86220df0678110df933745a46db178.tar.xz oslo-7e2805025d86220df0678110df933745a46db178.zip | |
Merge "Enable hacking H403 test"
Diffstat (limited to 'openstack/common/timeutils.py')
| -rw-r--r-- | openstack/common/timeutils.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/timeutils.py b/openstack/common/timeutils.py index 6094365..cb17487 100644 --- a/openstack/common/timeutils.py +++ b/openstack/common/timeutils.py @@ -141,7 +141,8 @@ def clear_time_override(): def marshall_now(now=None): """Make an rpc-safe datetime with microseconds. - Note: tzinfo is stripped, but not required for relative times.""" + Note: tzinfo is stripped, but not required for relative times. + """ if not now: now = utcnow() return dict(day=now.day, month=now.month, year=now.year, hour=now.hour, |