Merge tag 'v1.12.6'

Version 1.12.6

# Conflicts:
#	CHANGELOG.md
#	lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb
#	lib/bundler/version.rb

2 files changed, 6 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b32a5ccac4..1a7cf56ab8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -116,6 +116,11 @@ Bugfixes:
   - allow running `bundle install --deployment` after `bundle package --all` with path gems (#2175, @allenzhao)
   - add support for patchlevels in ruby versions in the gemfile and gemspecs (#4593, @chalkos)
 
+## 1.12.6 (2016-10-10)
+
+Bugfixes:
+  - add support for weak etags to the new index (@segiddins)
+
 ## 1.12.5 (2016-05-25)
 
 Bugfixes:
diff --git a/spec/bundler/fetcher/compact_index_spec.rb b/spec/bundler/fetcher/compact_index_spec.rb
index f6c6ba2ee1..e3f36666cc 100644
--- a/spec/bundler/fetcher/compact_index_spec.rb
+++ b/spec/bundler/fetcher/compact_index_spec.rb
@@ -15,7 +15,7 @@ describe Bundler::Fetcher::CompactIndex do
     it "has only one thread open at the end of the run" do
       compact_index.specs_for_names(["lskdjf"])
 
-      thread_count = Thread.list.select {|thread| thread.status == "run" }.count
+      thread_count = Thread.list.count {|thread| thread.status == "run" }
       expect(thread_count).to eq 1
     end