Skip to content

Commit 1bfc946

Browse files
Merge pull request #1 from cloudflare/master
rebase on master
2 parents 7c2aa53 + ea569c5 commit 1bfc946

File tree

122 files changed

+42259
-31032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+42259
-31032
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ language: go
33

44
matrix:
55
include:
6-
- go: 1.10.x
76
- go: 1.11.x
7+
- go: 1.12.x
88
- go: master
99
os: osx
1010
env: BUILD_TAGS=

Gopkg.lock

+9-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ required = [
5252

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

5757
[[constraint]]
5858
name = "github.com/jmhodges/clock"

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

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

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

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

3636
```
@@ -62,7 +62,7 @@ You can set the `GOOS` and `GOARCH` environment variables to have Go cross compi
6262
### Installation
6363

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

6868
```

vendor/github.com/gogo/protobuf/AUTHORS

-15
This file was deleted.

vendor/github.com/gogo/protobuf/CONTRIBUTORS

-23
This file was deleted.

vendor/github.com/gogo/protobuf/GOLANG_CONTRIBUTORS

-5
This file was deleted.

vendor/github.com/gogo/protobuf/LICENSE

-36
This file was deleted.

vendor/github.com/gogo/protobuf/proto/Makefile

-43
This file was deleted.

0 commit comments

Comments
 (0)