Permalink
Browse files

Version 1.0.21.rc

  • Loading branch information...
1 parent 517ae01 commit 6072ff563322d7887d8640335f10491c84e05c14 @indirect indirect committed Sep 30, 2011
Showing with 8 additions and 2 deletions.
  1. +7 −1 CHANGELOG.md
  2. +1 −1 lib/bundler/version.rb
View
8 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)
View
2 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

0 comments on commit 6072ff5

Please sign in to comment.