Version 1.6.0.rc with changelog

rubygems · Feb 17, 2014 · b12f33e · b12f33e
1 parent 3cb92e9
commit b12f33e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ Bugfixes:
   - gemspecs now handle filenames with newlines (#2634, @jasonmp85)
   - support escaped characters in usernames and passwords (@punkie)
   - no more exception on `update GEM` without lock file (@simi)
+  - allow long config values (#2823, @kgrz)
+  - cache successfully even locked to gems shipped with Ruby (#2869, @aughr)
+  - respect NO_PROXY even if a proxy is configured (#2878, @stlay)
 
 Features:
 
@@ -24,7 +27,7 @@ Features:
 Bugfixes:
 
   - find "missing" gems that are actually present (#2780, #2818, #2854)
-  - pse n-1 cores when given n jobs for parallel install (@jdickey)
+  - use n-1 cores when given n jobs for parallel install (@jdickey)
 
 ## 1.5.2 (2014-01-10)
 

diff --git 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.6.0.pre.2" unless defined?(::Bundler::VERSION)
+  VERSION = "1.6.0.rc" unless defined?(::Bundler::VERSION)
 end