From 6549da60399a251c3198606c5d04e42a39a399b8 Mon Sep 17 00:00:00 2001 From: Travis Reeder Date: Thu, 24 Aug 2017 13:54:38 -0700 Subject: [PATCH] Trying to get rid of conflicts for huge merge --- api/version/version.go | 2 +- cli/glide.lock | 181 ----------------------------------------- cli/glide.yaml | 45 ---------- 3 files changed, 1 insertion(+), 227 deletions(-) delete mode 100644 cli/glide.lock delete mode 100644 cli/glide.yaml diff --git a/api/version/version.go b/api/version/version.go index e30206f62..3a8eaf58a 100644 --- a/api/version/version.go +++ b/api/version/version.go @@ -1,4 +1,4 @@ package version // Version of Functions -var Version = "0.3.68" +var Version = "0.3.71" diff --git a/cli/glide.lock b/cli/glide.lock deleted file mode 100644 index 18348d748..000000000 --- a/cli/glide.lock +++ /dev/null @@ -1,181 +0,0 @@ -hash: fc16e358787292cb0b0d7f71adf4f0685b5994ca1c81788fdd056de21ebe7e55 -updated: 2017-08-18T21:34:47.686061147+03:00 -imports: -- name: github.com/asaskevich/govalidator - version: aa5cce4a76edb1a5acecab1870c17abbffb5419e -- name: github.com/aws/aws-sdk-go - version: b33b08175d12b795daa7726c5577b39d06a2551c - subpackages: - - aws - - aws/awserr - - aws/awsutil - - aws/client - - aws/client/metadata - - aws/corehandlers - - aws/credentials - - aws/credentials/ec2rolecreds - - aws/credentials/endpointcreds - - aws/credentials/stscreds - - aws/defaults - - aws/ec2metadata - - aws/endpoints - - aws/request - - aws/session - - aws/signer/v4 - - internal/shareddefaults - - private/protocol - - private/protocol/json/jsonutil - - private/protocol/jsonrpc - - private/protocol/query - - private/protocol/query/queryutil - - private/protocol/rest - - private/protocol/restjson - - private/protocol/xml/xmlutil - - service/lambda - - service/sts -- name: github.com/Azure/go-ansiterm - version: fa152c58bc15761d0200cb75fe958b89a9d4888e - subpackages: - - winterm -- name: github.com/coreos/go-semver - version: 8ab6407b697782a06568d4b7f1db25550ec2e4c6 - subpackages: - - semver -- name: github.com/docker/docker - version: 89658bed64c2a8fe05a978e5b87dbec409d57a0f - subpackages: - - pkg/jsonlog - - pkg/term - - pkg/term/windows -- name: github.com/docker/go-units - version: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 -- name: github.com/funcy/functions_go - version: e046aa4ca1f1028a04fc51395297ff07515cb0b6 - subpackages: - - client - - client/apps - - client/call - - client/operations - - client/routes - - models -- name: github.com/giantswarm/semver-bump - version: 88e6c9f2fe390c48839eaba32490fd09cb3b581c - subpackages: - - bump - - storage -- name: github.com/go-ini/ini - version: 3d73f4b845efdf9989fffd4b4e562727744a34ba -- name: github.com/go-openapi/analysis - version: 0473cb67199f68b8b7d90e641afd9e79ad36b851 -- name: github.com/go-openapi/errors - version: 03cfca65330da08a5a440053faf994a3c682b5bf -- name: github.com/go-openapi/jsonpointer - version: 779f45308c19820f1a69e9a4cd965f496e0da10f -- name: github.com/go-openapi/jsonreference - version: 36d33bfe519efae5632669801b180bf1a245da3b -- name: github.com/go-openapi/loads - version: a80dea3052f00e5f032e860dd7355cd0cc67e24d -- name: github.com/go-openapi/runtime - version: 2e9e988df6c290425033bacd425e008950c96be6 - subpackages: - - client -- name: github.com/go-openapi/spec - version: e81a13315ac92ce3e73075856c5cd50301695405 -- name: github.com/go-openapi/strfmt - version: 93a31ef21ac23f317792fff78f9539219dd74619 -- name: github.com/go-openapi/swag - version: f3f9494671f93fcff853e3c6e9e948b3eb71e590 -- name: github.com/go-openapi/validate - version: 035dcd74f1f61e83debe1c22950dc53556e7e4b2 -- name: github.com/go-resty/resty - version: f214013978f4ea5632ef88a5371b2028699a9d19 -- name: github.com/jmespath/go-jmespath - version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d -- name: github.com/jmoiron/jsonq - version: e874b168d07ecc7808bc950a17998a8aa3141d82 -- name: github.com/juju/errgo - version: 08cceb5d0b5331634b9826762a8fd53b29b86ad8 - subpackages: - - errors -- name: github.com/mailru/easyjson - version: 44c0351a5bc860bcb2608d54aa03ea686c4e7b25 - subpackages: - - buffer - - jlexer - - jwriter -- name: github.com/mitchellh/mapstructure - version: d0303fe809921458f417bcf828397a65db30a7e4 -- name: github.com/moby/moby - version: 90d35abf7b3535c1c319c872900fbd76374e521c - subpackages: - - pkg/jsonmessage -- name: github.com/Nvveen/Gotty - version: cd527374f1e5bff4938207604a14f2e38a9cf512 -- name: github.com/onsi/gomega - version: c893efa28eb45626cdaa76c9f653b62488858837 - subpackages: - - format - - internal/assertion - - internal/asyncassertion - - internal/oraclematcher - - internal/testingtsupport - - matchers - - matchers/support/goraph/bipartitegraph - - matchers/support/goraph/edge - - matchers/support/goraph/node - - matchers/support/goraph/util - - types -- name: github.com/PuerkitoBio/purell - version: b938d81255b5473c57635324295cb0fe398c7a58 -- name: github.com/PuerkitoBio/urlesc - version: bbf7a2afc14f93e1e0a5c06df524fbd75e5031e5 -- name: github.com/sirupsen/logrus - version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f - repo: https://github.com/sirupsen/logrus - vcs: git -- name: github.com/sirupsen/logrus - version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f -- name: github.com/urfave/cli - version: 4b90d79a682b4bf685762c7452db20f2a676ecb2 -- name: golang.org/x/net - version: f315505cf3349909cdf013ea56690da34e96a451 - subpackages: - - context - - context/ctxhttp - - html - - html/atom - - html/charset - - idna - - publicsuffix -- name: golang.org/x/sys - version: 0b25a408a50076fbbcae6b7ac0ea5fbb0b085e79 - subpackages: - - unix -- name: golang.org/x/text - version: 210eee5cf7323015d097341bcf7166130d001cd8 - subpackages: - - encoding - - encoding/charmap - - encoding/htmlindex - - encoding/internal - - encoding/internal/identifier - - encoding/japanese - - encoding/korean - - encoding/simplifiedchinese - - encoding/traditionalchinese - - encoding/unicode - - internal/tag - - internal/utf8internal - - language - - runes - - transform - - unicode/norm - - width -- name: gopkg.in/mgo.v2 - version: 3f83fa5005286a7fe593b055f0d7771a7dce4655 - subpackages: - - bson - - internal/json -- name: gopkg.in/yaml.v2 - version: cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b -testImports: [] diff --git a/cli/glide.yaml b/cli/glide.yaml deleted file mode 100644 index 0b978873e..000000000 --- a/cli/glide.yaml +++ /dev/null @@ -1,45 +0,0 @@ -package: github.com/fnproject/fn/cli -import: -- package: github.com/sirupsen/logrus - repo: https://github.com/sirupsen/logrus - vcs: git - version: v0.11.5 -- package: github.com/sirupsen/logrus - version: v0.11.5 -- package: github.com/aws/aws-sdk-go - version: ^1.8.36 - subpackages: - - aws - - aws/credentials - - aws/session - - service/lambda -- package: github.com/coreos/go-semver - version: ^0.2.0 - subpackages: - - semver -- package: github.com/funcy/functions_go - version: ^0.1.36 - subpackages: - - client - - client/apps - - client/call - - client/routes - - models -- package: github.com/giantswarm/semver-bump - version: ^1.1.1 - subpackages: - - bump - - storage -- package: github.com/go-openapi/runtime - subpackages: - - client -- package: github.com/go-openapi/strfmt -- package: github.com/jmoiron/jsonq -- package: github.com/moby/moby - version: ^17.5.0-ce-rc3 - subpackages: - - pkg/jsonmessage -- package: github.com/urfave/cli - # version: ^1.19.1 - version: master -- package: gopkg.in/yaml.v2