Permalink
Browse files

Merge v1.0.21 from branch '1-0-stable'

Conflicts:
	CHANGELOG.md
	lib/bundler/version.rb
  • Loading branch information...
2 parents 75ea4b1 + 177cda6 commit 82d4e19aa5eca5519e21767aa7a5494985b59268 @indirect indirect committed Sep 30, 2011
Showing with 13 additions and 4 deletions.
  1. +11 −1 CHANGELOG.md
  2. +2 −3 lib/bundler.rb
View
@@ -131,6 +131,16 @@ Removed:
- Removed bundle install --production
- Removed bundle install --disable-shared-gems
+## 1.0.21 (September 30, 2011)
+
+ - No changes from RC
+
+## 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:
@@ -139,7 +149,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
@@ -4,12 +4,11 @@
begin
# Pull in Psych if we can, but not if Syck is already loaded
- require 'psych' unless defined?(::YAML)
+ require 'psych' unless defined?(Syck)
rescue LoadError
-ensure
- require 'yaml'
end
+require 'yaml'
require 'bundler/rubygems_ext'
require 'bundler/rubygems_integration'
require 'bundler/version'

0 comments on commit 82d4e19

Please sign in to comment.