Merge #29586

29586: teamcity-trigger: pick up fix to teamcity client library r=tschottdorf,jordanlewis a=benesch Our stress builds were not getting triggered against the configured branch due to a bug in github.com/abourget/teamcity. Release note: None Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>
cockroachdb · Sep 6, 2018 · acc8f83 · acc8f83
2 parents 91a58e8 + a715ac5
commit acc8f83
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -86,6 +86,15 @@ ignored = [
  source = "https://github.com/cockroachdb/yaml"
  branch = "v2-encoding-style"
 
+[[constraint]]
+ name = "github.com/abourget/teamcity"
+ source = "https://github.com/cockroachdb/teamcity"
+
+# https://github.com/golang/dep/pull/2003
+[[constraint]]
+ name = "github.com/golang/dep"
+ branch = "master"
+
 # github.com/docker/docker depends on a few functions not included in the
 # latest release: reference.{FamiliarName,ParseNormalizedNamed,TagNameOnly}.
 #

diff --git a/vendor b/vendor