From 0c21c583fb74baf5143280e25dda445ef717a03b Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Fri, 24 Feb 2017 09:08:49 -0600
Subject: [PATCH 1/2] Install glide from ppa before running Travis tests (#343)

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

diff --git a/.travis.yml b/.travis.yml
index cea0d3d1a..56dec77f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ language: go
 go:
   - 1.7.x
   - master
+before_install:
+  - sudo add-apt-repository ppa:masterminds/glide -y
+  - sudo apt-get update -q
+  - sudo apt-get install glide -y
 script: make test
 notifications:
   slack:

From b27a93538125be819ba18a09b119f3d3ff7b2445 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Mon, 27 Feb 2017 14:22:14 -0600
Subject: [PATCH 2/2] Using Travis addons instead of before_install to continue
 using container-based infrastructure

---
 .travis.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 56dec77f7..4d5c27fd2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,12 @@ language: go
 go:
   - 1.7.x
   - master
-before_install:
-  - sudo add-apt-repository ppa:masterminds/glide -y
-  - sudo apt-get update -q
-  - sudo apt-get install glide -y
+addons:
+  apt:
+    sources:
+      - sourceline: 'ppa:masterminds/glide'
+    packages:
+      - glide
 script: make test
 notifications:
   slack: