summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-12-12 14:49:31 -0600
committerSHIBATA Hiroshi <hsbt@ruby-lang.org>2017-12-21 16:48:44 +0900
commit0034ef3416ca94d00839361dbeb0485b10a09c51 (patch)
tree641ef0d5f92d11a8657eafcea792b15fda77cbcf
parentf7414bcb17fe1bd67246021251b5f0527bd6afd1 (diff)
downloadbundler-0034ef3416ca94d00839361dbeb0485b10a09c51.tar.gz
Version 1.16.1 with changelogv1.16.1
-rw-r--r--CHANGELOG.md13
-rw-r--r--lib/bundler/version.rb2
2 files changed, 14 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d5d76ed8a..3aff6a5532 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 1.16.1 (2017-12-12)
+
+Bugfixes:
+
+ - avoid hanging on complex resolver errors ([#6114](https://github.com/bundler/bundler/issues/6114), @halfbyte)
+ - avoid an error when running `bundle update --group` ([#6156](https://github.com/bundler/bundler/issues/6156), @mattbrictson)
+ - ensure the resolver prefers non-pre-release gems when possible ([#6181](https://github.com/bundler/bundler/issues/6181), @greysteil)
+ - include bundler's gemspec in the built gem ([#6165](https://github.com/bundler/bundler/issues/6165), @dr-itz)
+ - ensure locally installed specs are not overriden by those in remote sources during dependency resolution ([#6072](https://github.com/bundler/bundler/issues/6072), @indirect)
+ - ensure custom gemfiles are respected in generated binstubs (@pftg)
+ - fail gracefully when loading a bundler-generated binstub when `bin/bundle` was not generated by bundler ([#6149](https://github.com/bundler/bundler/issues/6149), @hsbt)
+ - allow `bundle init` to be run even when a parent directory contains a gemfile ([#6205](https://github.com/bundler/bundler/issues/6205), @colby-swandale)
+
## 1.16.0 (2017-10-31)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index c2355ff2c8..87b648681a 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,7 +7,7 @@ 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.16.0" unless defined?(::Bundler::VERSION)
+ VERSION = "1.16.1" unless defined?(::Bundler::VERSION)
def self.overwrite_loaded_gem_version
begin