skia2/infra
Ben Wagner 92d3bc9c9f Fix merge conflict.
This resolves the conflict between
https://skia-review.googlesource.com/57120 and
https://skia-review.googlesource.com/57081.

No-Try: true
Change-Id: I45f47eb13dd7151b37b3b37f821232a02b9a43ff
Reviewed-on: https://skia-review.googlesource.com/57082
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
2017-10-08 19:57:02 +00:00
..
bots Fix merge conflict. 2017-10-08 19:57:02 +00:00
branch-config Switch many jobs to Clang. 2017-10-03 16:17:19 +00:00
config Roll recipe dependencies (trivial). 2017-10-06 00:46:34 +00:00
project-config Delete swarm_trigger recipe 2016-12-13 12:53:00 +00:00
README.md Added CQ config to skia repo 2015-06-08 05:12:56 -07:00

This directory contains infra-specific files. The branch-config/ directory contains configs that are specific to the master branch (e.g. config for the CQ committing to the master branch), while project-config/ directory contains project-wide configuration (e.g. list of buckets for cr-buildbucket service and list of refs known to the infra services).