From 2ade66443e776bf637f96a74d9d1231b5eadd44c Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 19 Nov 2015 23:57:16 -0800
Subject: [PATCH] core: retry bundler network calls a few times [GH-6097]

---
 CHANGELOG.md           | 2 ++
 lib/vagrant/bundler.rb | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 462bf8890..0652429cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,8 @@ BUG FIXES:
   - commands/box: outdated global won't halt on metadata download failure [GH-6453]
   - commands/package: when re-packaging a packaged box, preserve the
       generated SSH key [GH-5780]
+  - commands/plugin: retry plugin install automatically a few times to
+      avoid network issues [GH-6097]
   - commands/rdp: prefer `xfreerdp` if it is available on Linux [GH-6475]
   - commands/up: the `--provision-with` flag works with provisioner names [GH-5981]
   - communicator/ssh: fix potential crash case with PTY [GH-6225]
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index e12b89174..e6b5aca14 100644
--- a/lib/vagrant/bundler.rb
+++ b/lib/vagrant/bundler.rb
@@ -42,6 +42,9 @@ module Vagrant
           yield
         end
       end
+
+      # Configure Bundler to retry
+      ::Bundler.settings[:retry] = 3
     end
 
     # Initializes Bundler and the various gem paths so that we can begin