Merge branch 'master' into influxdata

This commit is contained in:
Lauren Tan 2019-03-03 16:10:21 -08:00 committed by GitHub
commit a351ee9262
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions

View file

@ -17,3 +17,9 @@ install:
script:
- yarn test
branches:
only:
- master
- staging # This is where pull requests from "bors r+" are built.
- trying # This is where pull requests from "bors try" are built.

6
bors.toml Normal file
View file

@ -0,0 +1,6 @@
status = [
"continuous-integration/travis-ci/push"
]
# Uncomment this to use a two hour timeout.
# The default is one hour.
#timeout_sec = 7200