From 5316f643666399ed2309ae239d2fe7b393c9e419 Mon Sep 17 00:00:00 2001 From: Saku Ytti Date: Wed, 26 Feb 2014 09:11:55 +0200 Subject: Switch OpenStruct#to_h to #marshal_dump for 1.9 1.9 does not have #to_h, unnecessarily breaks compatibility downwards --- lib/oxidized/config/core.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/oxidized/config/core.rb b/lib/oxidized/config/core.rb index 9b93d91..ec08dab 100644 --- a/lib/oxidized/config/core.rb +++ b/lib/oxidized/config/core.rb @@ -12,7 +12,7 @@ module Oxidized def load if File.exists? @file cfg = YAML.load_file @file - marshal_load self.to_h.merge(cfg) + marshal_load marshal_dump.merge(cfg) else save end -- cgit v1.2.1