From 8d650da2f8990998449861ec226f35e5018985f0 Mon Sep 17 00:00:00 2001 From: Manuel Laufenberg Date: Thu, 2 Mar 2017 09:39:43 +0100 Subject: [PATCH] Bump go-rancher version --- glide.lock | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++- glide.yaml | 2 +- 2 files changed, 175 insertions(+), 2 deletions(-) diff --git a/glide.lock b/glide.lock index 4b9f45666..f58c1d5ce 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,10 @@ +<<<<<<< HEAD hash: b1cbcbd938a47a246b0d4d634037b76e63486c63e5867b339f92bcbd7453b75c updated: 2017-04-07T11:34:46.101385591+01:00 +======= +hash: b4e99f1210c5bfb7784b55c9ec5b54629fadaea0625b29e540979b1acbd7dc09 +updated: 2017-03-02T09:39:03.718549862+01:00 +>>>>>>> 9af5ba3... Bump go-rancher version imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -357,7 +362,7 @@ imports: subpackages: - src/egoscale - name: github.com/rancher/go-rancher - version: 2c43ff300f3eafcbd7d0b89b10427fc630efdc1e + version: 5b8f6cc26b355ba03d7611fce3844155b7baf05b subpackages: - client - name: github.com/ryanuber/go-glob @@ -549,6 +554,7 @@ imports: - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 - name: k8s.io/client-go +<<<<<<< HEAD version: e121606b0d09b2e1c467183ee46217fa85a6b672 subpackages: - discovery @@ -659,3 +665,170 @@ imports: - tools/metrics - transport testImports: [] +======= + version: 1195e3a8ee1a529d53eed7c624527a68555ddf1f + subpackages: + - 1.5/discovery + - 1.5/kubernetes + - 1.5/kubernetes/typed/apps/v1alpha1 + - 1.5/kubernetes/typed/authentication/v1beta1 + - 1.5/kubernetes/typed/authorization/v1beta1 + - 1.5/kubernetes/typed/autoscaling/v1 + - 1.5/kubernetes/typed/batch/v1 + - 1.5/kubernetes/typed/certificates/v1alpha1 + - 1.5/kubernetes/typed/core/v1 + - 1.5/kubernetes/typed/extensions/v1beta1 + - 1.5/kubernetes/typed/policy/v1alpha1 + - 1.5/kubernetes/typed/rbac/v1alpha1 + - 1.5/kubernetes/typed/storage/v1beta1 + - 1.5/pkg/api + - 1.5/pkg/api/errors + - 1.5/pkg/api/install + - 1.5/pkg/api/meta + - 1.5/pkg/api/meta/metatypes + - 1.5/pkg/api/resource + - 1.5/pkg/api/unversioned + - 1.5/pkg/api/v1 + - 1.5/pkg/api/validation/path + - 1.5/pkg/apimachinery + - 1.5/pkg/apimachinery/announced + - 1.5/pkg/apimachinery/registered + - 1.5/pkg/apis/apps + - 1.5/pkg/apis/apps/install + - 1.5/pkg/apis/apps/v1alpha1 + - 1.5/pkg/apis/authentication + - 1.5/pkg/apis/authentication/install + - 1.5/pkg/apis/authentication/v1beta1 + - 1.5/pkg/apis/authorization + - 1.5/pkg/apis/authorization/install + - 1.5/pkg/apis/authorization/v1beta1 + - 1.5/pkg/apis/autoscaling + - 1.5/pkg/apis/autoscaling/install + - 1.5/pkg/apis/autoscaling/v1 + - 1.5/pkg/apis/batch + - 1.5/pkg/apis/batch/install + - 1.5/pkg/apis/batch/v1 + - 1.5/pkg/apis/batch/v2alpha1 + - 1.5/pkg/apis/certificates + - 1.5/pkg/apis/certificates/install + - 1.5/pkg/apis/certificates/v1alpha1 + - 1.5/pkg/apis/extensions + - 1.5/pkg/apis/extensions/install + - 1.5/pkg/apis/extensions/v1beta1 + - 1.5/pkg/apis/policy + - 1.5/pkg/apis/policy/install + - 1.5/pkg/apis/policy/v1alpha1 + - 1.5/pkg/apis/rbac + - 1.5/pkg/apis/rbac/install + - 1.5/pkg/apis/rbac/v1alpha1 + - 1.5/pkg/apis/storage + - 1.5/pkg/apis/storage/install + - 1.5/pkg/apis/storage/v1beta1 + - 1.5/pkg/auth/user + - 1.5/pkg/conversion + - 1.5/pkg/conversion/queryparams + - 1.5/pkg/fields + - 1.5/pkg/genericapiserver/openapi/common + - 1.5/pkg/labels + - 1.5/pkg/runtime + - 1.5/pkg/runtime/serializer + - 1.5/pkg/runtime/serializer/json + - 1.5/pkg/runtime/serializer/protobuf + - 1.5/pkg/runtime/serializer/recognizer + - 1.5/pkg/runtime/serializer/streaming + - 1.5/pkg/runtime/serializer/versioning + - 1.5/pkg/selection + - 1.5/pkg/third_party/forked/golang/reflect + - 1.5/pkg/types + - 1.5/pkg/util + - 1.5/pkg/util/cert + - 1.5/pkg/util/clock + - 1.5/pkg/util/errors + - 1.5/pkg/util/flowcontrol + - 1.5/pkg/util/framer + - 1.5/pkg/util/integer + - 1.5/pkg/util/intstr + - 1.5/pkg/util/json + - 1.5/pkg/util/labels + - 1.5/pkg/util/net + - 1.5/pkg/util/parsers + - 1.5/pkg/util/rand + - 1.5/pkg/util/runtime + - 1.5/pkg/util/sets + - 1.5/pkg/util/uuid + - 1.5/pkg/util/validation + - 1.5/pkg/util/validation/field + - 1.5/pkg/util/wait + - 1.5/pkg/util/yaml + - 1.5/pkg/version + - 1.5/pkg/watch + - 1.5/pkg/watch/versioned + - 1.5/plugin/pkg/client/auth + - 1.5/plugin/pkg/client/auth/gcp + - 1.5/plugin/pkg/client/auth/oidc + - 1.5/rest + - 1.5/tools/cache + - 1.5/tools/clientcmd/api + - 1.5/tools/metrics + - 1.5/transport +testImports: +- name: github.com/Azure/go-ansiterm + version: fa152c58bc15761d0200cb75fe958b89a9d4888e + subpackages: + - winterm +- name: github.com/cloudfoundry-incubator/candiedyaml + version: 99c3df83b51532e3615f851d8c2dbb638f5313bf +- name: github.com/docker/libcompose + version: d1876c1d68527a49c0aac22a0b161acc7296b740 + subpackages: + - config + - docker + - docker/builder + - docker/client + - docker/network + - labels + - logger + - lookup + - project + - project/events + - project/options + - utils + - version + - yaml +- name: github.com/flynn/go-shlex + version: 3f9db97f856818214da2e1057f8ad84803971cff +- name: github.com/go-check/check + version: 11d3bc7aa68e238947792f30573146a3231fc0f1 +- name: github.com/gorilla/mux + version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf +- name: github.com/libkermit/compose + version: cadc5a3b83a15790174bd7fbc75ea2529785e772 + subpackages: + - check +- name: github.com/libkermit/docker + version: 55e3595409924fcfbb850811e5a7cdbe8960a0b7 +- name: github.com/libkermit/docker-check + version: cbe0ef03b3d23070eac4d00ba8828f2cc7f7e5a3 +- name: github.com/opencontainers/runtime-spec + version: 06479209bdc0d4135911688c18157bd39bd99c22 + subpackages: + - specs-go +- name: github.com/vbatts/tar-split + version: 6810cedb21b2c3d0b9bb8f9af12ff2dc7a2f14df + subpackages: + - archive/tar + - tar/asm + - tar/storage +- name: github.com/vdemeester/shakers + version: 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3 +- name: github.com/xeipuuv/gojsonpointer + version: e0fe6f68307607d540ed8eac07a342c33fa1b54a +- name: github.com/xeipuuv/gojsonreference + version: e02fc20de94c78484cd5ffb007f8af96be030a45 +- name: github.com/xeipuuv/gojsonschema + version: 00f9fafb54d2244d291b86ab63d12c38bd5c3886 +- name: golang.org/x/time + version: a4bde12657593d5e90d0533a3e4fd95e635124cb + subpackages: + - rate +>>>>>>> 9af5ba3... Bump go-rancher version diff --git a/glide.yaml b/glide.yaml index 62091d1b6..1e701e574 100644 --- a/glide.yaml +++ b/glide.yaml @@ -139,7 +139,7 @@ import: subpackages: - proto - package: github.com/rancher/go-rancher - version: 2c43ff300f3eafcbd7d0b89b10427fc630efdc1e + version: 5b8f6cc26b355ba03d7611fce3844155b7baf05b - package: golang.org/x/oauth2/google version: 7fdf09982454086d5570c7db3e11f360194830ca - package: github.com/googleapis/gax-go