Merge remote-tracking branch 'upstream/develop' into mckael-experiments_2
Conflicts:
cmd/gondole-cli/main.go
language: go
go:
- 1.7
- 1.8
- master
matrix:
allow_failures:
- go: master
fast_finish: true
branches:
only:
- develop
- master
install:
- go get github.com/urfave/cli
- go get github.com/stretchr/testify/assert
- go get github.com/naoina/toml
- go get github.com/sendgrid/rest