summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md10
-rw-r--r--lib/bundler/version.rb2
2 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 677bd1153b..d141f60586 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
+## 1.9.6 (2015-05-02)
+
+Bugfixes:
+
+ - support RubyGems versions above 2.4.6 (@tenderlove, @segiddins, @indirect)
+ - allow creating gems with names containing two dashes (#3483, @janlelis)
+ - allow creating gems with names extending constants (#3603, @amatsuda)
+
## 1.9.5 (2015-04-29)
Bugfixes:
- - Respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
+ - respect Gemfile sources when installing a gem present in two sources (#3585, @tmoore)
## 1.9.4 (2015-04-13)
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 7d473a297f..b415f650c2 100644
--- 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.9.5" unless defined?(::Bundler::VERSION)
+ VERSION = "1.9.6" unless defined?(::Bundler::VERSION)
end