summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-10-10 14:34:35 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-10-10 14:34:35 -0500
commitbc746cbd8d13df66425f661371115ae092dcaff7 (patch)
treeb06aa749e5d6dbada0417442859eaa6e0649af66
parent1435cf50c2482019943dc868ce117b874afd58f6 (diff)
parent0b3e891567772d18440cd8a819ec4a48187cf34d (diff)
downloadbundler-bc746cbd8d13df66425f661371115ae092dcaff7.tar.gz
Merge tag 'v1.13.3'
Version 1.13.3 # Conflicts: # lib/bundler/vendor/compact_index_client/lib/compact_index_client/updater.rb
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/bundler/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a7cf56ab8..714b3082b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.13.3 (2016-10-10)
+
+Bugfixes:
+
+ - add support for weak etags to the new index (@segiddins)
+
## 1.13.2 (2016-09-30)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 5bfcfbf071..159148372e 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,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.13.2" unless defined?(::Bundler::VERSION)
+ VERSION = "1.13.3" unless defined?(::Bundler::VERSION)
end