You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/11/30 09:48:25 UTC
[6/8] git commit: Core: Require "json/pure" instead of buggy "json"
(DTACLOUD-382)
Core: Require "json/pure" instead of buggy "json" (DTACLOUD-382)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/a2165d97
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/a2165d97
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/a2165d97
Branch: refs/heads/master
Commit: a2165d97bea31131d3733204b22ddab072d673b5
Parents: b47315a
Author: Michal Fojtik <mf...@redhat.com>
Authored: Wed Nov 28 14:56:15 2012 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Fri Nov 30 09:42:20 2012 +0100
----------------------------------------------------------------------
server/lib/cimi/server.rb | 1 -
.../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 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a2165d97/server/lib/cimi/server.rb
----------------------------------------------------------------------
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'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a2165d97/server/lib/deltacloud/drivers/gogrid/gogrid_client.rb
----------------------------------------------------------------------
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
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a2165d97/server/lib/deltacloud/drivers/sbc/sbc_client.rb
----------------------------------------------------------------------
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
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a2165d97/server/lib/deltacloud/server.rb
----------------------------------------------------------------------
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'
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/a2165d97/server/lib/deltacloud_rack.rb
----------------------------------------------------------------------
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'