diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-01 18:59:20 -0400 |
| commit | ff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch) | |
| tree | c2c3b4938588549ea69653a46d98b27f6fe37b80 /Gopkg.lock | |
| parent | 2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff) | |
| parent | e73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff) | |
| download | chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2 chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'Gopkg.lock')
| -rw-r--r-- | Gopkg.lock | 53 |
1 files changed, 45 insertions, 8 deletions
diff --git a/Gopkg.lock b/Gopkg.lock index a8679b889..871301965 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -9,13 +9,6 @@ [[projects]] branch = "master" - name = "github.com/alecthomas/log4go" - packages = ["."] - revision = "9c17fbb2767ccbdda78584f28d545c44a4b29c4f" - source = "https://github.com/mattermost/log4go.git" - -[[projects]] - branch = "master" name = "github.com/armon/go-metrics" packages = ["."] revision = "783273d703149aaeb9897cf58613d5af48861c25" @@ -512,6 +505,31 @@ revision = "a0b114877d4caeffbd7f87e3757c17fce570fea7" [[projects]] + name = "go.uber.org/atomic" + packages = ["."] + revision = "8474b86a5a6f79c443ce4b2992817ff32cf208b8" + version = "v1.3.1" + +[[projects]] + name = "go.uber.org/multierr" + packages = ["."] + revision = "3c4937480c32f4c13a875a1829af76c98ca3d40a" + version = "v1.1.0" + +[[projects]] + name = "go.uber.org/zap" + packages = [ + ".", + "buffer", + "internal/bufferpool", + "internal/color", + "internal/exit", + "zapcore" + ] + revision = "eeedf312bc6c57391d84767a4cd413f02a917974" + version = "v1.8.0" + +[[projects]] branch = "master" name = "golang.org/x/crypto" packages = [ @@ -544,6 +562,7 @@ "bpf", "html", "html/atom", + "html/charset", "idna", "internal/iana", "internal/socket", @@ -567,12 +586,24 @@ packages = [ "collate", "collate/build", + "encoding", + "encoding/charmap", + "encoding/htmlindex", + "encoding/internal", + "encoding/internal/identifier", + "encoding/japanese", + "encoding/korean", + "encoding/simplifiedchinese", + "encoding/traditionalchinese", + "encoding/unicode", "internal/colltab", "internal/gen", "internal/tag", "internal/triegen", "internal/ucd", + "internal/utf8internal", "language", + "runes", "secure/bidirule", "transform", "unicode/bidi", @@ -608,6 +639,12 @@ version = "2.0.0" [[projects]] + name = "gopkg.in/natefinch/lumberjack.v2" + packages = ["."] + revision = "a96e63847dc3c67d17befa69c303767e2f84e54f" + version = "v2.1" + +[[projects]] name = "gopkg.in/olivere/elastic.v5" packages = [ ".", @@ -635,6 +672,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "a6a107c250033694b6d11085333da149e3e1171da3c23ce5bc9362148adef141" + inputs-digest = "c9e6f408ca532c6d09084fcd86678986225e8810585cbc0476a586f1d1969066" solver-name = "gps-cdcl" solver-version = 1 |