From: Michal Fojtik <[email protected]>
Signed-off-by: Michal fojtik <[email protected]> --- server/lib/cimi/server.rb | 1 - server/lib/deltacloud/drivers/gogrid/gogrid_client.rb | 1 - server/lib/deltacloud/drivers/sbc/sbc_client.rb | 1 - server/lib/deltacloud/server.rb | 1 - server/lib/deltacloud_rack.rb | 1 + 5 files changed, 1 insertion(+), 4 deletions(-) diff --git a/server/lib/cimi/server.rb b/server/lib/cimi/server.rb index 80e6200..9462f6f 100644 --- a/server/lib/cimi/server.rb +++ b/server/lib/cimi/server.rb @@ -15,7 +15,6 @@ require 'rubygems' require 'crack' -require 'json' require 'yaml' require 'haml' require 'sinatra/base' diff --git a/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb b/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb index 77fba97..31770e9 100644 --- a/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb +++ b/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb @@ -17,7 +17,6 @@ require 'digest/md5' require 'cgi' require 'open-uri' -require 'json' module Kernel def suppress_warnings diff --git a/server/lib/deltacloud/drivers/sbc/sbc_client.rb b/server/lib/deltacloud/drivers/sbc/sbc_client.rb index 97e89ca..0316467 100644 --- a/server/lib/deltacloud/drivers/sbc/sbc_client.rb +++ b/server/lib/deltacloud/drivers/sbc/sbc_client.rb @@ -16,7 +16,6 @@ require 'base64' require 'net/https' -require 'json' require 'digest/md5' module Deltacloud diff --git a/server/lib/deltacloud/server.rb b/server/lib/deltacloud/server.rb index 53249f3..7510dba 100644 --- a/server/lib/deltacloud/server.rb +++ b/server/lib/deltacloud/server.rb @@ -15,7 +15,6 @@ require 'rubygems' require 'crack' -require 'json' require 'yaml' require 'haml' require 'sinatra/base' diff --git a/server/lib/deltacloud_rack.rb b/server/lib/deltacloud_rack.rb index 4999083..b918566 100644 --- a/server/lib/deltacloud_rack.rb +++ b/server/lib/deltacloud_rack.rb @@ -14,6 +14,7 @@ # under the License. require 'require_relative' if RUBY_VERSION < '1.9' +require 'json/pure' require_relative './deltacloud/core_ext' require_relative './sinatra/rack_logger' -- 1.8.0
