Skip to content

Commit

Permalink
Merge pull request #27 from FormationAI/master
Browse files Browse the repository at this point in the history
Upgrading go.mozilla.org/sop to 3.3.1
  • Loading branch information
carlpett authored Sep 28, 2019
2 parents e90a9ba + 07ebe9c commit 14569ba
Show file tree
Hide file tree
Showing 22 changed files with 566 additions and 216 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ require (
github.com/sirupsen/logrus v1.3.0 // indirect
github.com/terraform-providers/terraform-provider-local v1.3.0
go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a // indirect
go.mozilla.org/sops v0.0.0-20181108154941-647d8ed41b61
go.mozilla.org/sops v0.0.0-20190611200209-e9e1e87723c8
gopkg.in/yaml.v2 v2.2.2
)
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,8 @@ go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a h1:N7VD+PwpJME2ZfQT8
go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a/go.mod h1:YDKUvO0b//78PaaEro6CAPH6NqohCmL2Cwju5XI2HoE=
go.mozilla.org/sops v0.0.0-20181108154941-647d8ed41b61 h1:WhkR/bFWbJW1xw8/VhBXOY2PD3BnT1Z4FeHUJa7+WbY=
go.mozilla.org/sops v0.0.0-20181108154941-647d8ed41b61/go.mod h1:njv+SYMHy9urU/V330aYWmWAP6EwAfN0WaRafSBgwfs=
go.mozilla.org/sops v0.0.0-20190611200209-e9e1e87723c8 h1:RGVnXInLdDvAWF8mT1gAl4M/6g4GyIRB0ltFPV7PtT4=
go.mozilla.org/sops v0.0.0-20190611200209-e9e1e87723c8/go.mod h1:njv+SYMHy9urU/V330aYWmWAP6EwAfN0WaRafSBgwfs=
go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI=
go.opencensus.io v0.18.0 h1:Mk5rgZcggtbvtAun5aJzAtjKKN/t0R3jJPlWILlv938=
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
Expand Down
7 changes: 4 additions & 3 deletions vendor/go.mozilla.org/sops/.travis.yml

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

45 changes: 45 additions & 0 deletions vendor/go.mozilla.org/sops/CHANGELOG.rst

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

8 changes: 8 additions & 0 deletions vendor/go.mozilla.org/sops/CODE_OF_CONDUCT.md

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

5 changes: 3 additions & 2 deletions vendor/go.mozilla.org/sops/CONTRIBUTING.md

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

2 changes: 1 addition & 1 deletion vendor/go.mozilla.org/sops/Dockerfile

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

7 changes: 7 additions & 0 deletions vendor/go.mozilla.org/sops/Makefile

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

122 changes: 90 additions & 32 deletions vendor/go.mozilla.org/sops/README.rst

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

Loading

0 comments on commit 14569ba

Please sign in to comment.