From a4c7bb822873924619f95edc9baee654fb3d6f1f Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 11 Jun 2016 00:41:26 +0200
Subject: [PATCH 1/2] Lock bundler to 1.12.5

---
 vagrant.gemspec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vagrant.gemspec b/vagrant.gemspec
index 75bde6ab6..7d5d39234 100644
--- a/vagrant.gemspec
+++ b/vagrant.gemspec
@@ -16,7 +16,11 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant"
 
-  s.add_dependency "bundler", ">= 1.5.2", "<= 1.12.0"
+  # Do not update the Bundler constraint. Vagrant relies on internal Bundler
+  # APIs, so even point releases can introduce breaking changes. These changes
+  # are *untestable* until after a release is made because there is no way for
+  # Bundler to exec into itself. Please do not update the Bundler constraint.
+  s.add_dependency "bundler", "= 1.12.5"
   s.add_dependency "childprocess", "~> 0.5.0"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"

From cfb3e695f03ec2a8ca3ed0ce4b440e8857f1dbac Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Sat, 11 Jun 2016 00:51:53 +0200
Subject: [PATCH 2/2] Install a specific version of bundler

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index bd19bb951..ea1e84fbc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ sudo: false
 
 cache: bundler
 
+before_install:
+  - gem install bundler -v '1.12.5'
+
 addons:
   apt:
     packages: