diff --git a/cmd/gen.go b/cmd/gen.go index 29b0f1b00917f2f23b7f58329a42aaed250a10b4..cce000e70e856b78d434d73e54fb11619d2b17e5 100644 --- a/cmd/gen.go +++ b/cmd/gen.go @@ -72,5 +72,5 @@ var packageTemplate = template.Must(template.New("").Parse( "// {{ .Timestamp }}\n" + "package globals\n\n" + "const GITVERSION = `{{ .GITVER }}`\n" + - "const SEMVER = \"0.1.0\"\n" + + "const SEMVER = \"1.0.0\"\n" + "const GLIDEDEPS = `{{ .GLIDEDEPS }}`\n")) diff --git a/globals/checkVersion.go b/globals/checkVersion.go index 06522fd7a35827fa7e5fa5f7632a9b4bd5c2a325..0c3c71d607b09a8c475fd7ac7dcc24549ba31bca 100644 --- a/globals/checkVersion.go +++ b/globals/checkVersion.go @@ -77,7 +77,7 @@ func checkVersion(ours string, theirs string) (ok bool, err error) { return false, errors.Wrapf(err, "Error parsing our version (%v)", ours) } - return theirVersion.isCompatible(ourVersion), nil + return ourVersion.isCompatible(theirVersion), nil } // Utility method, returns whether the local version and remote version are diff --git a/globals/version.go b/globals/version.go index 7b9e2f56d872ca34d3716019e3a554470c70bc4f..8d0af4e447094600bf61071f74f895a4b34c8125 100644 --- a/globals/version.go +++ b/globals/version.go @@ -1,12 +1,12 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2019-11-20 09:59:26.914126 -0800 PST m=+0.012443432 +// 2020-01-27 14:55:54.3400274 -0800 STD m=+0.059355601 package globals -const GITVERSION = `ed9b1a7 Merge branch 'release' into connectionRefactor` -const SEMVER = "0.1.0" +const GITVERSION = `b4a70e9 Merge branch 'SuppressError' into 'release'` +const SEMVER = "1.0.0" const GLIDEDEPS = `hash: 1d2d2b561c9ab69ca26c5c10441883c15fc5491fbcd30bcc51e7f16d48d6e095 -updated: 2019-10-22T15:20:35.984784-07:00 +updated: 2019-10-18T10:25:42.8425249-07:00 imports: - name: github.com/fsnotify/fsnotify version: 4bf2d1fec78374803a39307bfb8d340688f4f28e @@ -17,7 +17,7 @@ imports: subpackages: - stack - name: github.com/golang/protobuf - version: ed6926b37a637426117ccab59282c3839528a700 + version: 1680a479a2cfb3fa22b972af7e36d0a0fde47bf8 subpackages: - proto - protoc-gen-go/descriptor @@ -40,7 +40,7 @@ imports: - name: github.com/inconshreveable/mousetrap version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 - name: github.com/magiconair/properties - version: a586bb8b7deaae2a0eb4c6c8b63a539425628137 + version: de8848e004dd33dc07a2947b3d76f618a7fc7ef1 - name: github.com/mitchellh/go-homedir version: af06845cf3004701891bf4fdb884bfe4920b3727 repo: https://github.com/mitchellh/go-homedir.git @@ -48,7 +48,7 @@ imports: - name: github.com/mitchellh/mapstructure version: 3536a929edddb9a5b34bd6861dc4a9647cb459fe - name: github.com/pelletier/go-toml - version: 5edf9acd3ea9181a0df1bc87651e5dcf4e158a35 + version: e87c92d4f423f333363e6d45b03f65ff8becd029 - name: github.com/pkg/errors version: 27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7 - name: github.com/spf13/afero @@ -73,7 +73,7 @@ imports: version: 82fcdeb203eb6ab2a67d0a623d9c19e5e5a64927 vcs: git - name: gitlab.com/elixxir/comms - version: 7b5755d06d10be5bc98ef7c3bcaa5488eba3663a + version: 52224bff4ee219b49c193179753e1eec951941be repo: git@gitlab.com:elixxir/comms vcs: git subpackages: @@ -83,7 +83,7 @@ imports: - mixmessages - registration - name: gitlab.com/elixxir/crypto - version: 1dcfa5e528beaf524ac27c7dcf4e64ea5d2273de + version: d12eb719b4d870929c5f5b346b604a437304cbab repo: git@gitlab.com:elixxir/crypto vcs: git subpackages: @@ -114,7 +114,7 @@ imports: - blake2b - hkdf - name: golang.org/x/net - version: ec77196f6094c3492a8b61f2c11cf937f78992ae + version: da9a3fd4c5820e74b24a6cb7fb438dc9b0dd377c subpackages: - context - http/httpguts @@ -124,7 +124,7 @@ imports: - internal/timeseries - trace - name: golang.org/x/sys - version: 742c48ecaeb7c624c475e02f3eb0827ebb4970d4 + version: 727590c5006e77ca5247972f47e877f4929fc985 subpackages: - cpu - unix @@ -140,7 +140,7 @@ imports: subpackages: - googleapis/rpc/status - name: google.golang.org/grpc - version: c0909e91a5045e735b2718a92e1bfef59d39b04e + version: 7c3115d8bba8df106f26e55d52db456ed42893f8 subpackages: - backoff - balancer @@ -162,8 +162,6 @@ imports: - internal/envconfig - internal/grpcrand - internal/grpcsync - - internal/resolver/dns - - internal/resolver/passthrough - internal/syscall - internal/transport - keepalive @@ -173,6 +171,8 @@ imports: - reflection - reflection/grpc_reflection_v1alpha - resolver + - resolver/dns + - resolver/passthrough - serviceconfig - stats - status