Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1 from cloudflare/master
rebase on master
  • Loading branch information
andrewheberle committed Apr 1, 2019
2 parents 7c2aa53 + ea569c5 commit 1bfc946
Show file tree
Hide file tree
Showing 122 changed files with 42,259 additions and 31,032 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -3,8 +3,8 @@ language: go

matrix:
include:
- go: 1.10.x
- go: 1.11.x
- go: 1.12.x
- go: master
os: osx
env: BUILD_TAGS=
Expand Down
25 changes: 9 additions & 16 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Expand Up @@ -52,7 +52,7 @@ required = [

[[constraint]]
name = "github.com/google/certificate-transparency-go"
revision = "5ab67e519c93568ac3ee50fd6772a5bcf8aa460d"
version = "v1.0.21"

[[constraint]]
name = "github.com/jmhodges/clock"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -8,7 +8,7 @@

CFSSL is CloudFlare's PKI/TLS swiss army knife. It is both a command line
tool and an HTTP API server for signing, verifying, and bundling TLS
certificates. It requires Go 1.10+ to build.
certificates. It requires Go 1.11+ to build.

Note that certain linux distributions have certain algorithms removed
(RHEL-based distributions in particular), so the golang from the
Expand All @@ -30,7 +30,7 @@ CFSSL consists of:
### Building

Building cfssl requires a
[working Go 1.10+ installation](http://golang.org/doc/install) and a
[working Go 1.11+ installation](http://golang.org/doc/install) and a
properly set `GOPATH`.

```
Expand Down Expand Up @@ -62,7 +62,7 @@ You can set the `GOOS` and `GOARCH` environment variables to have Go cross compi
### Installation

Installation requires a
[working Go 1.10+ installation](http://golang.org/doc/install) and a
[working Go 1.11+ installation](http://golang.org/doc/install) and a
properly set `GOPATH`.

```
Expand Down
15 changes: 0 additions & 15 deletions vendor/github.com/gogo/protobuf/AUTHORS

This file was deleted.

23 changes: 0 additions & 23 deletions vendor/github.com/gogo/protobuf/CONTRIBUTORS

This file was deleted.

5 changes: 0 additions & 5 deletions vendor/github.com/gogo/protobuf/GOLANG_CONTRIBUTORS

This file was deleted.

36 changes: 0 additions & 36 deletions vendor/github.com/gogo/protobuf/LICENSE

This file was deleted.

43 changes: 0 additions & 43 deletions vendor/github.com/gogo/protobuf/proto/Makefile

This file was deleted.

0 comments on commit 1bfc946

Please sign in to comment.