summaryrefslogtreecommitdiff
path: root/lib/oxidized/config
diff options
context:
space:
mode:
authorSaku Ytti <saku@ytti.fi>2014-02-26 09:11:55 +0200
committerSaku Ytti <saku@ytti.fi>2014-02-26 09:11:55 +0200
commit5316f643666399ed2309ae239d2fe7b393c9e419 (patch)
tree271d41cc2e440f1d423c729a20f37a21821f7e30 /lib/oxidized/config
parent6748aba0669da3d897f3647cf668a72e7eb85514 (diff)
Switch OpenStruct#to_h to #marshal_dump for 1.9
1.9 does not have #to_h, unnecessarily breaks compatibility downwards
Diffstat (limited to 'lib/oxidized/config')
-rw-r--r--lib/oxidized/config/core.rb2
1 files changed, 1 insertions, 1 deletions
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