From fd2f487aa014d3aeb4b8c6f411f66199306ec0b0 Mon Sep 17 00:00:00 2001
From: Rodrigo Estebanez <restebanez@mdsol.com>
Date: Tue, 1 Oct 2013 14:44:00 +0200
Subject: [PATCH] memory is an integer Conflicts: 
 lib/fog/vcloud_director/models/compute/vm.rb

---
 lib/fog/vcloud_director/models/compute/vm.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fog/vcloud_director/models/compute/vm.rb b/lib/fog/vcloud_director/models/compute/vm.rb
index ad7b43ea1..0ba17488b 100644
--- a/lib/fog/vcloud_director/models/compute/vm.rb
+++ b/lib/fog/vcloud_director/models/compute/vm.rb
@@ -17,7 +17,7 @@ module Fog
         attribute :operating_system
         attribute :ip_address
         attribute :cpu, :type => :integer
-        attribute :memory
+        attribute :memory, :type => :integer
         attribute :hard_disks, :aliases => :disks
 
         def reload