Merge pull request #2341 from influxdata/master

Upgrade telegraf to 1.1.1 and influxdb to 1.1.0

library/influxdb

@@ -1,31 +1,21 @@
 Maintainers: Jonathan A. Sternberg <[email protected]> (@jsternberg)
 
-Tags: 0.13, 0.13.0
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: ec08f02c8a4a15bcea2a6c46517eceb9284633a2
-Directory: influxdb/0.13
-
-Tags: 0.13-alpine, 0.13.0-alpine
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: ec08f02c8a4a15bcea2a6c46517eceb9284633a2
-Directory: influxdb/0.13/alpine
-
-Tags: 1.0, 1.0.2, latest
+Tags: 1.0, 1.0.2
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: 21becafddfa32acce5bdcfd44d29709dd89f3d23
 Directory: influxdb/1.0
 
-Tags: 1.0-alpine, 1.0.2-alpine, alpine
+Tags: 1.0-alpine, 1.0.2-alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: 21becafddfa32acce5bdcfd44d29709dd89f3d23
 Directory: influxdb/1.0/alpine
 
-Tags: 1.1.0-rc2
+Tags: 1.1, 1.1.0, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: c8d8cf8ac76a7d7814307fbf542ef87fc15c86e6
+GitCommit: d7ef94eb81e4d5c6d56f0c14fb66e57982da21a1
 Directory: influxdb/1.1
 
-Tags: 1.1.0-rc2-alpine
+Tags: 1.1-alpine, 1.1.0-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: c8d8cf8ac76a7d7814307fbf542ef87fc15c86e6
+GitCommit: d7ef94eb81e4d5c6d56f0c14fb66e57982da21a1
 Directory: influxdb/1.1/alpine

library/telegraf

@@ -10,12 +10,12 @@ GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: a86d1ecbaa12a696c10ed66bf4390c42fe733582
 Directory: telegraf/1.0/alpine
 
-Tags: 1.1, 1.1.0, latest
+Tags: 1.1, 1.1.1, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 5bfae0d45f25aa52a2bfd2ebcc7f1af52dad90ae
+GitCommit: 902362bdf052871ad6232dbf66fb3d767ccca5db
 Directory: telegraf/1.1
 
-Tags: 1.1-alpine, 1.1.0-alpine, alpine
+Tags: 1.1-alpine, 1.1.1-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 5bfae0d45f25aa52a2bfd2ebcc7f1af52dad90ae
+GitCommit: 902362bdf052871ad6232dbf66fb3d767ccca5db
 Directory: telegraf/1.1/alpine