Merge pull request #2327 from influxdata/master

Upgrade kapacitor and telegraf to 1.1

library/kapacitor

@@ -1,31 +1,21 @@
 Maintainers: Jonathan A. Sternberg <[email protected]> (@jsternberg)
 
-Tags: 0.13, 0.13.1
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: ec08f02c8a4a15bcea2a6c46517eceb9284633a2
-Directory: kapacitor/0.13
-
-Tags: 0.13-alpine, 0.13.1-alpine
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: ec08f02c8a4a15bcea2a6c46517eceb9284633a2
-Directory: kapacitor/0.13/alpine
-
-Tags: 1.0, 1.0.2, latest
+Tags: 1.0, 1.0.2
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: dec27fb32f5d9696cd0627f3ac97d353f7557b31
 Directory: kapacitor/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: dec27fb32f5d9696cd0627f3ac97d353f7557b31
 Directory: kapacitor/1.0/alpine
 
-Tags: 1.1.0-rc2
+Tags: 1.1, 1.1.0, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 16886a77b6f592184033965d5326720119e00bd3
+GitCommit: 5bfae0d45f25aa52a2bfd2ebcc7f1af52dad90ae
 Directory: kapacitor/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: 16886a77b6f592184033965d5326720119e00bd3
+GitCommit: 5bfae0d45f25aa52a2bfd2ebcc7f1af52dad90ae
 Directory: kapacitor/1.1/alpine

library/telegraf

@@ -1,31 +1,21 @@
 Maintainers: Jonathan A. Sternberg <[email protected]> (@jsternberg)
 
-Tags: 0.13, 0.13.1
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: ec08f02c8a4a15bcea2a6c46517eceb9284633a2
-Directory: telegraf/0.13
-
-Tags: 0.13-alpine, 0.13.1-alpine
-GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: ec08f02c8a4a15bcea2a6c46517eceb9284633a2
-Directory: telegraf/0.13/alpine
-
-Tags: 1.0, 1.0.1, latest
+Tags: 1.0, 1.0.1
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: a86d1ecbaa12a696c10ed66bf4390c42fe733582
 Directory: telegraf/1.0
 
-Tags: 1.0-alpine, 1.0.1-alpine, alpine
+Tags: 1.0-alpine, 1.0.1-alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
 GitCommit: a86d1ecbaa12a696c10ed66bf4390c42fe733582
 Directory: telegraf/1.0/alpine
 
-Tags: 1.1.0-rc1
+Tags: 1.1, 1.1.0, latest
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 3dea2cb6c6d61be9049ad7fb16b2c43758708b3a
+GitCommit: 5bfae0d45f25aa52a2bfd2ebcc7f1af52dad90ae
 Directory: telegraf/1.1
 
-Tags: 1.1.0-rc1-alpine
+Tags: 1.1-alpine, 1.1.0-alpine, alpine
 GitRepo: git://github.com/influxdata/influxdata-docker
-GitCommit: 3dea2cb6c6d61be9049ad7fb16b2c43758708b3a
+GitCommit: 5bfae0d45f25aa52a2bfd2ebcc7f1af52dad90ae
 Directory: telegraf/1.1/alpine