From 2b7938fe3451416c505e0ed6ae62397ec99099f2 Mon Sep 17 00:00:00 2001
From: Akshay Shah <shah@uber.com>
Date: Fri, 19 Feb 2016 17:12:04 -0800
Subject: [PATCH] Test on Go 1.5 in Travis

---
 .travis.yml | 4 ++++
 Makefile    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e86597e92..394b974f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,11 @@
 language: go
 go:
+  - 1.5
   - 1.6
   - tip
+env:
+  global:
+    - GO15VENDOREXPERIMENT=1
 cache:
   directories:
     - vendor
diff --git a/Makefile b/Makefile
index 45feaa9cf..1a1a65fce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+export GO15VENDOREXPERIMENT=1
 
 BENCH_FLAGS ?= -cpuprofile=cpu.pprof -memprofile=mem.pprof -benchmem
 PACKAGES ?= $(shell glide novendor)