Merge to resolve conflicts in vendored packages

2019-05-30 14:33:14 -04:00
parent e13c535019 a4dbe7b102
commit 7e0637f6a9
173 changed files with 12742 additions and 1252 deletions
--- a/vendor/github.com/pkg/errors/format_test.go
+++ b/vendor/github.com/pkg/errors/format_test.go
@@ -516,7 +516,7 @@ type wrapper struct {
 	want []string
 }

-func prettyBlocks(blocks []string) string {
+func prettyBlocks(blocks []string, prefix ...string) string {
 	var out []string

 	for _, b := range blocks {