Merge "Load 'json' gem even on 1.9.3"
This commit is contained in:
commit
e38141ff16
@ -1,11 +1,11 @@
|
||||
require 'uri'
|
||||
require 'faraday'
|
||||
|
||||
if RUBY_VERSION == '1.8.7'
|
||||
require 'rubygems'
|
||||
require 'json'
|
||||
end
|
||||
|
||||
require 'uri'
|
||||
require 'faraday'
|
||||
require 'json'
|
||||
|
||||
Puppet::Type.type(:midonet_gateway).provide(:midonet_api_caller) do
|
||||
|
||||
def create
|
||||
|
@ -1,12 +1,11 @@
|
||||
require 'uri'
|
||||
require 'faraday'
|
||||
# Host registry type
|
||||
|
||||
if RUBY_VERSION == '1.8.7'
|
||||
require 'rubygems'
|
||||
require 'json'
|
||||
end
|
||||
|
||||
require 'uri'
|
||||
require 'faraday'
|
||||
require 'json'
|
||||
|
||||
Puppet::Type.type(:midonet_host_registry).provide(:midonet_api_caller) do
|
||||
|
||||
def create
|
||||
|
Loading…
x
Reference in New Issue
Block a user