dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflicts

This commit is contained in:
Kelvin Wang 2018-06-22 10:48:18 -07:00
parent cdc15205d8
commit e7ff7d506b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gopkg.lock generated
View File

@ -968,6 +968,6 @@
[solve-meta] [solve-meta]
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
inputs-digest = "024194b983d91b9500fe97e0aa0ddb5fe725030cb51ddfb034e386cae1098370" inputs-digest = "ef9c9e12bdc7296af3d450d44966b8ae465e9b845c1409b8027e52998b3c01e0"
solver-name = "gps-cdcl" solver-name = "gps-cdcl"
solver-version = 1 solver-version = 1

4
Gopkg.toml
View File

@ -108,6 +108,10 @@
name = "github.com/kballard/go-shellquote" name = "github.com/kballard/go-shellquote"
branch = "master" branch = "master"
[[constraint]]
name = "github.com/kelwang/gojenkins"
version = "=v1.0.1"
[[constraint]] [[constraint]]
name = "github.com/matttproud/golang_protobuf_extensions" name = "github.com/matttproud/golang_protobuf_extensions"
version = "1.0.1" version = "1.0.1"