Merge branch 'cpu-go-1.11' into test-cpu-go-1.11

letsencrypt · Sep 21, 2018 · acd523a · acd523a
2 parents e017143 + b72deef
commit acd523a
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 16 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     boulder:
         # To minimize fetching this should be the same version used below
-        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11}:2018-09-20
+        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11}:2018-09-21
         environment:
             FAKE_DNS: 127.0.0.1
             PKCS11_PROXY_SOCKET: tcp://boulder-hsm:5657
@@ -51,7 +51,7 @@ services:
         working_dir: /go/src/github.com/letsencrypt/boulder
     bhsm:
         # To minimize fetching this should be the same version used above
-        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11}:2018-09-20
+        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11}:2018-09-21
         environment:
             PKCS11_DAEMON_SOCKET: tcp://0.0.0.0:5657
         command: /usr/local/bin/pkcs11-daemon /usr/lib/softhsm/libsofthsm2.so
@@ -73,7 +73,7 @@ services:
         logging:
             driver: none
     netaccess:
-        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11}:2018-09-20
+        image: letsencrypt/boulder-tools-go${TRAVIS_GO_VERSION:-1.11}:2018-09-21
         networks:
           - bluenet
         volumes:

diff --git a/ra/ra_test.go b/ra/ra_test.go
@@ -310,6 +310,7 @@ func initAuthorities(t *testing.T) (*DummyValidationAuthority, *sa.SQLStorageAut
 }
 
 func assertAuthzEqual(t *testing.T, a1, a2 core.Authorization) {
+	t.Helper()
 	test.Assert(t, a1.ID == a2.ID, "ret != DB: ID")
 	test.Assert(t, a1.Identifier == a2.Identifier, "ret != DB: Identifier")
 	test.Assert(t, a1.Status == a2.Status, "ret != DB: Status")

diff --git a/vendor/github.com/zmap/zlint/README.md b/vendor/github.com/zmap/zlint/README.md
diff --git a/vendor/github.com/zmap/zlint/lints/lint_ev_business_category_missing.go b/vendor/github.com/zmap/zlint/lints/lint_ev_business_category_missing.go
diff --git a/vendor/github.com/zmap/zlint/lints/lint_ev_country_name_missing.go b/vendor/github.com/zmap/zlint/lints/lint_ev_country_name_missing.go
diff --git a/vendor/github.com/zmap/zlint/lints/lint_ev_organization_name_missing.go b/vendor/github.com/zmap/zlint/lints/lint_ev_organization_name_missing.go
diff --git a/vendor/github.com/zmap/zlint/lints/lint_ev_serial_number_missing.go b/vendor/github.com/zmap/zlint/lints/lint_ev_serial_number_missing.go
diff --git a/vendor/github.com/zmap/zlint/lints/lint_ev_valid_time_too_long.go b/vendor/github.com/zmap/zlint/lints/lint_ev_valid_time_too_long.go
diff --git a/vendor/github.com/zmap/zlint/util/gtld_map.go b/vendor/github.com/zmap/zlint/util/gtld_map.go