From f64e312e92b88e5c5459a97e02064b643facafc5 Mon Sep 17 00:00:00 2001 From: Kyle Rames Date: Fri, 1 Mar 2013 16:48:16 -0600 Subject: [PATCH] Revert "[rackspace] adding accept headers to block_storage, cdn, compute_v2, databases, identity, load_balancers, storage" This reverts commit e438f21e68c84e3685f3c6a1effc640c60f253c9. --- lib/fog/rackspace/block_storage.rb | 1 - lib/fog/rackspace/cdn.rb | 1 - lib/fog/rackspace/compute_v2.rb | 1 - lib/fog/rackspace/databases.rb | 2 +- lib/fog/rackspace/identity.rb | 1 - lib/fog/rackspace/load_balancers.rb | 1 - lib/fog/rackspace/storage.rb | 1 - 7 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/fog/rackspace/block_storage.rb b/lib/fog/rackspace/block_storage.rb index 100d3a0a2..8614283d1 100644 --- a/lib/fog/rackspace/block_storage.rb +++ b/lib/fog/rackspace/block_storage.rb @@ -94,7 +94,6 @@ module Fog response = @connection.request(params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), :host => @host, diff --git a/lib/fog/rackspace/cdn.rb b/lib/fog/rackspace/cdn.rb index bec7562a4..2abf220d7 100644 --- a/lib/fog/rackspace/cdn.rb +++ b/lib/fog/rackspace/cdn.rb @@ -128,7 +128,6 @@ module Fog response = @connection.request(params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), :host => @host, diff --git a/lib/fog/rackspace/compute_v2.rb b/lib/fog/rackspace/compute_v2.rb index aa1fb557c..adaa2246e 100644 --- a/lib/fog/rackspace/compute_v2.rb +++ b/lib/fog/rackspace/compute_v2.rb @@ -120,7 +120,6 @@ module Fog response = @connection.request(params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), :host => @host, diff --git a/lib/fog/rackspace/databases.rb b/lib/fog/rackspace/databases.rb index d88d1b48c..cb42fa580 100644 --- a/lib/fog/rackspace/databases.rb +++ b/lib/fog/rackspace/databases.rb @@ -82,7 +82,7 @@ module Fog response = @connection.request(params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', + 'Accept:' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), :host => @host, diff --git a/lib/fog/rackspace/identity.rb b/lib/fog/rackspace/identity.rb index b1b46cc46..911c7b86a 100644 --- a/lib/fog/rackspace/identity.rb +++ b/lib/fog/rackspace/identity.rb @@ -61,7 +61,6 @@ module Fog parameters = params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }, :host => @host, diff --git a/lib/fog/rackspace/load_balancers.rb b/lib/fog/rackspace/load_balancers.rb index 2666acebe..69d013f04 100644 --- a/lib/fog/rackspace/load_balancers.rb +++ b/lib/fog/rackspace/load_balancers.rb @@ -125,7 +125,6 @@ module Fog response = @connection.request(params.merge!({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), :host => @host, diff --git a/lib/fog/rackspace/storage.rb b/lib/fog/rackspace/storage.rb index f6eec775a..072c3c83a 100644 --- a/lib/fog/rackspace/storage.rb +++ b/lib/fog/rackspace/storage.rb @@ -118,7 +118,6 @@ module Fog response = @connection.request(params.merge({ :headers => { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), :host => @host,