Skip to content

Commit 6ff792c

Browse files
Merge pull request #156 from bradmwilliams/v1
[cherry-pick] Fix offset-naive and offset-aware operation
2 parents 83b9807 + fc7239c commit 6ff792c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ansible/rebuild_module.digest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b9f2fc80c76c94dcf58c7f61045572a7 -
1+
b7af09a03b07253d2a0ea339e7d3530d -

ansible/roles/openshift_client_python/library/openshift_client_python.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/openshift/action.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ def oc_action(context, verb, cmd_args=None, all_namespaces=False, no_namespace=F
291291
return_code = -1
292292

293293
start_time = time.time()
294-
exec_time = int((datetime.datetime.now(datetime.timezone.utc) - datetime.datetime(1970, 1, 1)).total_seconds() * 1000)
294+
exec_time = int((datetime.datetime.now(datetime.timezone.utc) - datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)).total_seconds() * 1000)
295295

296296
if context.get_ssh_client() is not None:
297297
references['.client_host'] = '{}@{}'.format(context.get_ssh_username() or '', context.get_ssh_hostname())

0 commit comments

Comments
 (0)