deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mar...@apache.org
Subject git commit: CIMI - fix Time parse on Machine model (creation time) - DTACLOUD-370
Date Wed, 14 Nov 2012 09:30:01 GMT
Updated Branches:
  refs/heads/master d8392739f -> ac7f2672f


CIMI - fix Time parse on Machine model (creation time) - DTACLOUD-370

https://issues.apache.org/jira/browse/DTACLOUD-370


Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/ac7f2672
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/ac7f2672
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/ac7f2672

Branch: refs/heads/master
Commit: ac7f2672f438a5bb98cbb3ed99c73c037e2dd9a3
Parents: d839273
Author: marios <marios@redhat.com>
Authored: Wed Nov 14 10:04:12 2012 +0200
Committer: marios <marios@redhat.com>
Committed: Wed Nov 14 11:29:23 2012 +0200

----------------------------------------------------------------------
 server/lib/cimi/models/machine.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltacloud/blob/ac7f2672/server/lib/cimi/models/machine.rb
----------------------------------------------------------------------
diff --git a/server/lib/cimi/models/machine.rb b/server/lib/cimi/models/machine.rb
index 1958806..199a168 100644
--- a/server/lib/cimi/models/machine.rb
+++ b/server/lib/cimi/models/machine.rb
@@ -125,7 +125,7 @@ class CIMI::Model::Machine < CIMI::Model::Base
     machine_spec = {
       :name => instance.name,
       :description => "Instance #{instance.name}",
-      :created => instance.launch_time.nil? ? Time.now.xmlschema : Time.parse(instance.launch_time).xmlschema,
+      :created => instance.launch_time.nil? ? Time.now.xmlschema : Time.parse(instance.launch_time.to_s).xmlschema,
       :id => context.machine_url(instance.id),
       :state => convert_instance_state(instance.state),
       :cpu => cpu || convert_instance_cpu(instance.instance_profile, context),


Mime
View raw message