diff options
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | lib/bundler/version.rb | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 07d62aed55..8f48b781a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 1.0.21.rc (September 29, 2011) + +Bugfixes: + + - Load Psych unless Syck is defined, because 1.9.2 defines YAML + ## 1.0.20 (September 27, 2011) Features: @@ -6,7 +12,7 @@ Features: Bugfixes: - - Ensure yaml is required even if psych is found + - Ensure YAML is required even if Psych is found - Handle directory names that contain invalid regex characters ## 1.0.20.rc (September 18, 2011) diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb index d88c33782a..1b54227a02 100644 --- a/lib/bundler/version.rb +++ b/lib/bundler/version.rb @@ -2,5 +2,5 @@ module Bundler # We're doing this because we might write tests that deal # with other versions of bundler and we are unsure how to # handle this better. - VERSION = "1.0.20" unless defined?(::Bundler::VERSION) + VERSION = "1.0.21.rc" unless defined?(::Bundler::VERSION) end |