lib/fog/openstack/volume.rb in fog-maestrodev-1.18.0.20131121075022 vs lib/fog/openstack/volume.rb in fog-maestrodev-1.18.0.20131122203507

@@ -59,11 +59,10 @@
         def self.reset
           @data = nil
         end
 
         def initialize(options={})
-          require 'multi_json'
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
 
           @auth_token = Fog::Mock.random_base64(64)
@@ -106,12 +105,10 @@
       class Real
         attr_reader :current_user
         attr_reader :current_tenant
 
         def initialize(options={})
-          require 'multi_json'
-
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
             missing_credentials = Array.new
             @openstack_api_key  = options[:openstack_api_key]
@@ -179,10 +176,10 @@
             else
               error
             end
           end
           unless response.body.empty?
-            response.body = MultiJson.decode(response.body)
+            response.body = Fog::JSON.decode(response.body)
           end
           response
         end
 
         private