From 80d4864844ab1e74f28852b0475532e3ce9415d5 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 25 Oct 2016 13:17:27 +0100
Subject: [PATCH] Only install fpm,rpm,boto if we need them

---
 CHANGELOG.md           | 1 +
 circle.yml             | 3 ---
 scripts/circle-test.sh | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7bc5e7f8d..efea23f16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ continue sending logs to /var/log/telegraf/telegraf.log.
 
 ### Bugfixes
 
+- [#1926](https://github.com/influxdata/telegraf/issues/1926): Fix toml unmarshal panic in Duration objects.
 - [#1746](https://github.com/influxdata/telegraf/issues/1746): Fix handling of non-string values for JSON keys listed in tag_keys.
 - [#1628](https://github.com/influxdata/telegraf/issues/1628): Fix mongodb input panic on version 2.2.
 - [#1733](https://github.com/influxdata/telegraf/issues/1733): Fix statsd scientific notation parsing
diff --git a/circle.yml b/circle.yml
index 4d5ede725..38445f032 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,9 +12,6 @@ machine:
 dependencies:
   override:
     - docker info
-  post:
-    - gem install fpm
-    - sudo apt-get install -y rpm python-boto
 
 test:
   override:
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 662426392..6e7a125c1 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -75,6 +75,10 @@ cat telegraf-race | gzip > $CIRCLE_ARTIFACTS/telegraf-race.gz
 
 eval "git describe --exact-match HEAD"
 if [ $? -eq 0 ]; then
+    # install fpm (packaging dependency)
+    exit_if_fail gem install fpm
+    # install boto & rpm (packaging & AWS dependencies)
+    exit_if_fail sudo apt-get install -y rpm python-boto
     unset GOGC
     tag=$(git describe --exact-match HEAD)
     echo $tag