squash merge from dev branch

This commit is contained in:
Steve Brunton
2017-09-04 22:52:14 -04:00
parent 123cd935a3
commit ed916703c6
1058 changed files with 311598 additions and 3 deletions

6
vendor/github.com/prometheus/common/.travis.yml generated vendored Normal file
View File

@@ -0,0 +1,6 @@
sudo: false
language: go
go:
- 1.7.5
- tip