Bump up minimum go version required to 1.6

Signed-off-by: Prashanth Pai <ppai@redhat.com>

Makefile

@@ -33,14 +33,14 @@ install: check-go check-reqs vendor-update
 
 vendor-update:
 	@echo Updating vendored packages
-	@GO15VENDOREXPERIMENT=1 glide install
+	@glide install
 	@echo
 
 verify: check-reqs
-	@GO15VENDOREXPERIMENT=1 gometalinter -D gotype -E gofmt --errors --deadline=5m -j 4 $$(GO15VENDOREXPERIMENT=1 glide nv)
+	@gometalinter -D gotype -E gofmt --errors --deadline=5m -j 4 $$(glide nv)
 
 test:
-	@GO15VENDOREXPERIMENT=1 go test $$(GO15VENDOREXPERIMENT=1 glide nv)
+	@go test $$(glide nv)
 
 release: check-go check-reqs vendor-update
 	@./scripts/release.sh

scripts/build.sh

@@ -15,7 +15,7 @@ LDFLAGS="-X github.com/gluster/glusterd2/gdctx.GlusterdVersion=$VERSION"
 BIN=$(basename $(go list -f '{{.ImportPath}}'))
 
 echo "Building $BIN $VERSION"
-GO15VENDOREXPERIMENT=1 go build -ldflags "${LDFLAGS}" -o $OUTDIR/$BIN || exit 1
+go build -ldflags "${LDFLAGS}" -o $OUTDIR/$BIN || exit 1
 echo "Built $BIN $VERSION at $OUTDIR/$BIN"
 
 

scripts/check-go.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-# We require a minimum of Go 1.5 as we make use of the vendor/ directory
+# We require a minimum of Go 1.6 as we make use of the vendor/ directory
 
 REQ_GO_MAJOR_VERSION="1"
-REQ_GO_MINOR_VERSION="5"
+REQ_GO_MINOR_VERSION="6"
 
 REQ_GO_VERSION="$REQ_GO_MAJOR_VERSION.$REQ_GO_MINOR_VERSION"
 

wercker.yml

@@ -1,4 +1,4 @@
-box: golang:1.5
+box: golang:1.6
 
 build:
   steps:
@@ -6,10 +6,6 @@ build:
     - wercker/setup-go-workspace:
         package_dir: github.com/gluster/glusterd2
 
-    - script:
-        name: enable go1.5 vendoring experiment
-        code: export GO15VENDOREXPERIMENT=1
-
     - script:
         name: install build and test requirements
         code: |