Merge branch 'master' of github.com:fog/fog into cdn

lib/fog/hp/requests/storage/get_object.rb

@@ -19,7 +19,6 @@ module Fog
             )
           else
             response = request({
-              :block  => block,
               :expects  => 200,
               :method   => 'GET',
               :path     => "#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"

lib/fog/hp/requests/storage/get_shared_object.rb

@@ -22,7 +22,6 @@ module Fog
             )
           else
             response = shared_request({
-              :block  => block,
               :expects  => 200,
               :method   => 'GET',
               :path     => path

lib/fog/openstack/requests/storage/get_object.rb

@@ -17,7 +17,6 @@ module Fog
           end
 
           request(params.merge!({
-            :block    => block,
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}"

lib/fog/ovirt/compute.rb

@@ -42,6 +42,7 @@ module Fog
       request :list_template_volumes
       request :add_volume
       request :destroy_volume
+      request :get_api_version
 
       module Shared
         # converts an OVIRT object into an hash for fog to consume.

lib/fog/ovirt/models/compute/server.rb

@@ -33,7 +33,7 @@ module Fog
         end
 
         def locked?
-          !!(status =~ /locked/i)
+          !!(status =~ /locked/i) || (attributes[:volumes]=nil) || volumes.any?{|v| !!(v.status =~ /locked/i)}
         end
 
         def stopped?
@@ -84,7 +84,7 @@ module Fog
         end
 
         def start(options = {})
-          wait_for { stopped? } if options[:blocking]
+          wait_for { !locked? } if options[:blocking]
           service.vm_action(:id =>id, :action => :start)
           reload
         end

lib/fog/ovirt/models/compute/volume.rb

@@ -15,6 +15,7 @@ module Fog
         attribute :format
         attribute :sparse
         attribute :size_gb
+        attribute :status
 
         def size_gb
           attributes[:size_gb] ||= attributes[:size].to_i / DISK_SIZE_TO_GB if attributes[:size]

lib/fog/ovirt/requests/compute/get_api_version.rb

@@ -0,0 +1,16 @@
+module Fog
+  module Compute
+    class Ovirt
+      class Real
+        def api_version
+          client.api_version
+        end
+      end
+      class Mock
+        def api_version
+          "3.1"
+        end
+      end
+    end
+  end
+end

lib/fog/rackspace/requests/storage/get_object.rb

@@ -17,7 +17,6 @@ module Fog
           end
 
           request(params.merge!({
-            :block    => block,
             :expects  => 200,
             :method   => 'GET',
             :path     => "#{Fog::Rackspace.escape(container)}/#{Fog::Rackspace.escape(object)}"

tests/core/user_agent_tests.rb

@@ -1,6 +1,6 @@
 Shindo.tests('Fog::Connection', 'core') do
   tests('user_agent').returns("fog/#{Fog::VERSION}") do
     conn = Fog::Connection.new("http://www.testserviceurl.com", false, {})
-    conn.instance_variable_get(:@excon).connection[:headers]['User-Agent']
+    conn.instance_variable_get(:@excon).data[:headers]['User-Agent']
   end
 end