diff options
| author | Andre Arko <andre@arko.net> | 2011-09-30 13:42:00 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-09-30 13:42:00 -0700 |
| commit | 82d4e19aa5eca5519e21767aa7a5494985b59268 (patch) | |
| tree | 6e021ed230e23f5bcba39bc5694f21aacaf1a535 /CHANGELOG.md | |
| parent | 75ea4b173853e69b20e5b9d5f1ebd2441463fd4d (diff) | |
| parent | 177cda685fdb1c786718c260a577f8b132955cbc (diff) | |
| download | bundler-82d4e19aa5eca5519e21767aa7a5494985b59268.tar.gz | |
Merge v1.0.21 from branch '1-0-stable'
Conflicts:
CHANGELOG.md
lib/bundler/version.rb
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cf9390d47..51322eb72d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) |