Merge pull request #3412 from influxdata/master

telegraf 1.4.0 and influxdb initialization

library/influxdb

@@ -2,20 +2,20 @@ Maintainers: Jonathan A. Sternberg <[email protected]> (@jsternberg)
 
 Tags: 1.2, 1.2.4
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 3a8019600cefcb4ffc85c3e3a155980d2dc3f5ff
+GitCommit: 75787dfb82c3bc5f7ee04ffe7cb5acd3b26cc0e7
 Directory: influxdb/1.2
 
 Tags: 1.2-alpine, 1.2.4-alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 3a8019600cefcb4ffc85c3e3a155980d2dc3f5ff
+GitCommit: 75787dfb82c3bc5f7ee04ffe7cb5acd3b26cc0e7
 Directory: influxdb/1.2/alpine
 
 Tags: 1.3, 1.3.5, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 941d149a37b1860a055d5a0743d066918b06584e
+GitCommit: 75787dfb82c3bc5f7ee04ffe7cb5acd3b26cc0e7
 Directory: influxdb/1.3
 
 Tags: 1.3-alpine, 1.3.5-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 941d149a37b1860a055d5a0743d066918b06584e
+GitCommit: 75787dfb82c3bc5f7ee04ffe7cb5acd3b26cc0e7
 Directory: influxdb/1.3/alpine

library/telegraf

@@ -1,21 +1,21 @@
 Maintainers: Jonathan A. Sternberg <[email protected]> (@jsternberg)
 
-Tags: 1.2, 1.2.1
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 9c2c0d225ca0f2cb5d28749ed2bbd25122b46c9f
-Directory: telegraf/1.2
-
-Tags: 1.2-alpine, 1.2.1-alpine
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 9c2c0d225ca0f2cb5d28749ed2bbd25122b46c9f
-Directory: telegraf/1.2/alpine
-
-Tags: 1.3, 1.3.5, latest
+Tags: 1.3, 1.3.5
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: acd3023f04fc25ef8b4ebe2535b093bdc976ae57
 Directory: telegraf/1.3
 
-Tags: 1.3-alpine, 1.3.5-alpine, alpine
+Tags: 1.3-alpine, 1.3.5-alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: acd3023f04fc25ef8b4ebe2535b093bdc976ae57
 Directory: telegraf/1.3/alpine
+
+Tags: 1.4, 1.4.0, latest
+GitRepo: git://github.com/influxdata/influxdata-docker
+GitCommit: 75787dfb82c3bc5f7ee04ffe7cb5acd3b26cc0e7
+Directory: telegraf/1.4
+
+Tags: 1.4-alpine, 1.4.0-alpine, alpine
+GitRepo: git://github.com/influxdata/influxdata-docker
+GitCommit: 75787dfb82c3bc5f7ee04ffe7cb5acd3b26cc0e7
+Directory: telegraf/1.4/alpine