From 4610ca671420365ded49c5fbbeb4d9d16f4b9814 Mon Sep 17 00:00:00 2001 From: hsbt Date: Wed, 2 Sep 2015 09:50:00 +0000 Subject: * ext/psych/*: merge psych master(8737e5b). It contains following fixes. https://github.com/tenderlove/psych/pull/242 https://github.com/tenderlove/psych/pull/246 [ruby-list:50219] * test/psych/*: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/psych/lib/psych.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/psych/lib/psych.rb') diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb index ef8f12a472..1a3cb65ebc 100644 --- a/ext/psych/lib/psych.rb +++ b/ext/psych/lib/psych.rb @@ -223,7 +223,7 @@ require 'psych/class_loader' module Psych # The version is Psych you're using - VERSION = '2.0.14' + VERSION = '2.0.15' # The version of libyaml Psych is using LIBYAML_VERSION = Psych.libyaml_version.join '.' -- cgit v1.2.3