squash merge from dev branch

2017-09-04 22:52:14 -04:00
parent 123cd935a3
commit ed916703c6
1058 changed files with 311598 additions and 3 deletions
--- a/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/README
+++ b/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/README
@@ -0,0 +1,2 @@
+This directory contains some empty files that are the symlinks the files in the "fd" directory point to.
+They are otherwise ignored by the tests
--- a/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/abc
+++ b/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/abc
--- a/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/def
+++ b/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/def
--- a/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/ghi
+++ b/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/ghi
--- a/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/uvw
+++ b/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/uvw
--- a/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/xyz
+++ b/vendor/github.com/prometheus/procfs/fixtures/symlinktargets/xyz