| commit | 4c229296f00237c922cbe5dfe8052a7374921f12 | [log] [tgz] |
|---|---|---|
| author | Joe Gregorio <jcgregorio@google.com> | Thu Jan 03 15:57:17 2019 -0500 |
| committer | Joe Gregorio <jcgregorio@google.com> | Thu Jan 03 21:00:36 2019 +0000 |
| tree | 4c313e475f09aab22a857d1286f24f56577fa2bf | |
| parent | c0366c1d95e4588728ce01fe569544acfd8bc1f1 [diff] |
Unfork unrolled/secure. Now that https://github.com/unrolled/secure/pull/46 has landed. Bug: skia: Change-Id: I41c67d23a731026dbc94e1f5f8f439f2ffda0ab0 Reviewed-on: https://skia-review.googlesource.com/c/180774 Reviewed-by: Joe Gregorio <jcgregorio@google.com>
diff --git a/am/go/alert-manager/main.go b/am/go/alert-manager/main.go index 19faf60..c3e6a79 100644 --- a/am/go/alert-manager/main.go +++ b/am/go/alert-manager/main.go
@@ -14,7 +14,6 @@ "cloud.google.com/go/pubsub" "github.com/gorilla/mux" - "github.com/skia-dev/secure" "go.skia.org/infra/am/go/incident" "go.skia.org/infra/am/go/note" "go.skia.org/infra/am/go/silence" @@ -30,6 +29,7 @@ "go.skia.org/infra/go/sklog" "go.skia.org/infra/go/util" "google.golang.org/api/option" + "gopkg.in/unrolled/secure.v1" ) // flags
diff --git a/go/baseapp/baseapp.go b/go/baseapp/baseapp.go index 5f48b8a..ec43c35 100644 --- a/go/baseapp/baseapp.go +++ b/go/baseapp/baseapp.go
@@ -10,10 +10,10 @@ "time" "github.com/gorilla/mux" - "github.com/skia-dev/secure" "go.skia.org/infra/go/common" "go.skia.org/infra/go/httputils" "go.skia.org/infra/go/sklog" + "gopkg.in/unrolled/secure.v1" ) var (