From 1b6bc88c14e218aed31cd4a854d6d37aee725231 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sun, 21 Feb 2016 10:41:46 -0700
Subject: [PATCH] Turn GOGC on for packaging, use go 1.5.3

---
 circle.yml             | 6 +++---
 scripts/circle-test.sh | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 67c29ef4a..8fd255a78 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,9 +4,9 @@ machine:
   post:
     - sudo service zookeeper stop
     - go version
-    - go version | grep 1.5.2 || sudo rm -rf /usr/local/go
-    - wget https://storage.googleapis.com/golang/go1.5.2.linux-amd64.tar.gz
-    - sudo tar -C /usr/local -xzf go1.5.2.linux-amd64.tar.gz
+    - go version | grep 1.5.3 || sudo rm -rf /usr/local/go
+    - wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
+    - sudo tar -C /usr/local -xzf go1.5.3.linux-amd64.tar.gz
     - go version
 
 dependencies:
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index ab0956518..16812b980 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -72,6 +72,8 @@ mv $GOPATH/bin/telegraf $CIRCLE_ARTIFACTS
 
 eval "git describe --exact-match HEAD"
 if [ $? -eq 0 ]; then
+    # Turn GOGC back on for making packages
+    export GOGC=100
     tag=$(git describe --exact-match HEAD)
     echo $tag
     exit_if_fail ./scripts/build.py --package --version=$tag --platform=linux --arch=all --upload