[ARVADOS] updated: 44823f311ea0328c3a2aeefb7208a74031436d52
git at public.curoverse.com
git at public.curoverse.com
Wed Mar 18 09:42:32 EDT 2015
Summary of changes:
services/api/lib/db_current_time.rb | 2 +-
.../arvnodeman/computenode/dispatch/__init__.py | 15 +++++++++---
.../arvnodeman/computenode/driver/__init__.py | 6 +++++
.../arvnodeman/computenode/driver/dummy.py | 4 ++++
.../arvnodeman/computenode/driver/ec2.py | 4 ++++
.../arvnodeman/computenode/driver/gce.py | 10 ++++++++
services/nodemanager/arvnodeman/daemon.py | 1 +
.../nodemanager/tests/test_computenode_dispatch.py | 27 ++++++++++++++++++----
.../tests/test_computenode_driver_ec2.py | 6 +++++
.../tests/test_computenode_driver_gce.py | 13 +++++++++++
services/nodemanager/tests/testutil.py | 5 ++++
11 files changed, 85 insertions(+), 8 deletions(-)
via 44823f311ea0328c3a2aeefb7208a74031436d52 (commit)
via 9917d9eef58c161420fe119f19611d332a345507 (commit)
via b38fea181afac08137243a294a502e4605d679d8 (commit)
via fff9d822fdf8857a7d8e22c024bc4f04b3b94129 (commit)
via 18148ec24bf63ec3353a2cd38f6f07c460037db2 (commit)
from 3606f69d567cb34cd3ab53c0fb994e30867450e1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 44823f311ea0328c3a2aeefb7208a74031436d52
Merge: 9917d9e b38fea1
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 18 09:41:23 2015 -0400
Merge branch 'master' into 5383-api-db-current-time
commit 9917d9eef58c161420fe119f19611d332a345507
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 18 09:38:26 2015 -0400
5383: Add back Time.parse(). Without it the value returned would be of the format 2015-03-18 13:37:11 UTC,
and with Time.parse it would be 2015-03-18 09:37:11 -0400, which is the same as Time.now.
diff --git a/services/api/lib/db_current_time.rb b/services/api/lib/db_current_time.rb
index 5c97baa..b4a6423 100644
--- a/services/api/lib/db_current_time.rb
+++ b/services/api/lib/db_current_time.rb
@@ -2,6 +2,6 @@ module DbCurrentTime
CURRENT_TIME_SQL = "SELECT clock_timestamp()"
def db_current_time
- ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL).to_time
+ Time.parse(ActiveRecord::Base.connection.select_value(CURRENT_TIME_SQL)).to_time
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list