From d3369de34128d3acef7d4e29d0bc0317f2ff6679 Mon Sep 17 00:00:00 2001
From: Keerthan Mala <kmala@engineyard.com>
Date: Thu, 25 Feb 2016 14:48:56 -0700
Subject: [PATCH] update(minio): update to minio server to master

---
 Makefile          | 2 +-
 server/install.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index af3d76c..cc65683 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ kube-mc-integration:
 
 # build the minio server
 build-server:
-	docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.5.2 ./install.sh
+	docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.6 ./install.sh
 
 mc-build:
 	make -C mc build
diff --git a/server/install.sh b/server/install.sh
index fa661c5..304506c 100755
--- a/server/install.sh
+++ b/server/install.sh
@@ -12,7 +12,8 @@
 apt-get update && apt-get install -yq yasm
 mkdir -p $GOPATH/src/github.com/minio
 cd $GOPATH/src/github.com/minio
-git clone -b deis --single-branch https://github.com/deis/minio-src.git minio
+git clone -b master --single-branch https://github.com/minio/minio.git minio
 cd minio
+git reset --hard 356b889
 make install
 cp $GOPATH/bin/minio /pwd/minio