Reset glide files to versions from upstream/v1.2.
This commit is contained in:
Timo Reimann
Emile Vauge
parent
5250c9c04d
commit
fd1cf2484c
2 changed files with 125 additions and 82 deletions
201
glide.lock
generated
201
glide.lock
generated
|
|
@ -1,6 +1,7 @@
|
|||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
hash: b1cbcbd938a47a246b0d4d634037b76e63486c63e5867b339f92bcbd7453b75c
|
||||
updated: 2017-04-07T11:34:46.101385591+01:00
|
||||
=======
|
||||
|
|
@ -15,6 +16,10 @@ updated: 2017-03-02T14:57:08.032744661-07:00
|
|||
hash: f4360ad29820f7366aeb1bb85f3765c0b9dc4388ed5a072ead82209b5230ce25
|
||||
updated: 2017-03-14T10:10:22.924762706Z
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
hash: 6d21d24827ef1c9321e8a41a328c42f891281af2ea68841d42411f23b0666d4b
|
||||
updated: 2017-03-02T14:57:08.032744661-07:00
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
imports:
|
||||
- name: bitbucket.org/ww/goautoneg
|
||||
version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675
|
||||
|
|
@ -24,9 +29,9 @@ imports:
|
|||
- compute/metadata
|
||||
- internal
|
||||
- name: github.com/abbot/go-http-auth
|
||||
version: d45c47bedec736d172957bd394786b76626fa8ac
|
||||
version: cb4372376e1e00e9f6ab9ec142e029302c9e7140
|
||||
- name: github.com/ArthurHlt/go-eureka-client
|
||||
version: 82ab0c5125adfe7fc313e3f73536177b2452b5ed
|
||||
version: ba361cd0f9f571b4e871421423d2f02f5689c3d2
|
||||
subpackages:
|
||||
- eureka
|
||||
- name: github.com/ArthurHlt/gominlog
|
||||
|
|
@ -69,6 +74,7 @@ imports:
|
|||
- service/route53
|
||||
- service/sts
|
||||
- name: github.com/Azure/azure-sdk-for-go
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 088007b3b08cc02b27f2eadfdcd870958460ce7e
|
||||
subpackages:
|
||||
|
|
@ -82,37 +88,49 @@ imports:
|
|||
- name: github.com/Azure/go-autorest
|
||||
version: ec5f4903f77ed9927ac95b19ab8e44ada64c1356
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 1620af6b32398bfc91827ceae54a8cc1f55df04d
|
||||
subpackages:
|
||||
- arm/dns
|
||||
- name: github.com/Azure/go-autorest
|
||||
version: 32cc2321122a649b7ba4e323527bcb145134fd47
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
subpackages:
|
||||
- autorest
|
||||
- autorest/azure
|
||||
- autorest/date
|
||||
- autorest/to
|
||||
- autorest/validation
|
||||
- name: github.com/beorn7/perks
|
||||
version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
|
||||
version: b965b613227fddccbfffe13eae360ed3fa822f8d
|
||||
subpackages:
|
||||
- quantile
|
||||
- name: github.com/blang/semver
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 31b736133b98f26d5e078ec9eb591666edfd091f
|
||||
=======
|
||||
version: 4a1e882c79dcf4ec00d2e29fac74b9c8938d5052
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 3a37c301dda64cbe17f16f661b4c976803c0e2d2
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
- name: github.com/boltdb/bolt
|
||||
version: e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd
|
||||
version: 5cc10bbbc5c141029940133bb33c9e969512a698
|
||||
- name: github.com/BurntSushi/toml
|
||||
version: e643e9ef00b049d75de26e61109c5ea01885cd21
|
||||
version: 99064174e013895bbd9b025c31100bd1d9b590ca
|
||||
- name: github.com/BurntSushi/ty
|
||||
version: 6add9cd6ad42d389d6ead1dde60b4ad71e46fd74
|
||||
subpackages:
|
||||
- fun
|
||||
- name: github.com/cenk/backoff
|
||||
version: 3db60c813733fce657c114634171689bbf1f8dee
|
||||
version: 8edc80b07f38c27352fb186d971c628a6c32552b
|
||||
- name: github.com/codahale/hdrhistogram
|
||||
version: 9208b142303c12d8899bae836fd524ac9338b4fd
|
||||
- name: github.com/codegangsta/cli
|
||||
version: bf4a526f48af7badd25d2cb02d587e1b01be3b50
|
||||
- name: github.com/codegangsta/negroni
|
||||
version: c0db5feaa33826cd5117930c8f4ee5c0f565eec6
|
||||
version: dc6b9d037e8dab60cbfc09c61d6932537829be8b
|
||||
- name: github.com/containous/flaeg
|
||||
version: b5d2dc5878df07c2d74413348186982e7b865871
|
||||
- name: github.com/containous/mux
|
||||
|
|
@ -128,11 +146,15 @@ imports:
|
|||
- pkg/pathutil
|
||||
- pkg/types
|
||||
- name: github.com/coreos/go-oidc
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 5644a2f50e2d2d5ba0b474bc5bc55fea1925936d
|
||||
=======
|
||||
version: be73733bb8cc830d0205609b95d125215f8e9c70
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 9e117111587506b9dc83b7b38263268bf48352ea
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
subpackages:
|
||||
- http
|
||||
- jose
|
||||
|
|
@ -150,14 +172,15 @@ imports:
|
|||
- httputil
|
||||
- timeutil
|
||||
- name: github.com/davecgh/go-spew
|
||||
version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
|
||||
version: 6d212800a42e8ab5c146b8ace3490ee17e5225f9
|
||||
subpackages:
|
||||
- spew
|
||||
- name: github.com/daviddengcn/go-colortext
|
||||
version: 3b18c8575a432453d41fdafb340099fff5bba2f7
|
||||
- name: github.com/decker502/dnspod-go
|
||||
version: 68650ee11e182e30773781d391c66a0c80ccf9f2
|
||||
version: f6b1d56f1c048bd94d7e42ac36efb4d57b069b6f
|
||||
- name: github.com/dgrijalva/jwt-go
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
|
||||
- name: github.com/dnsimple/dnsimple-go
|
||||
|
|
@ -167,6 +190,9 @@ imports:
|
|||
=======
|
||||
version: d2709f9f1f31ebcda9651b03077758c1f3a0018c
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
- name: github.com/docker/distribution
|
||||
version: 325b0804fef3a66309d962357aac3c2ce3f4d329
|
||||
subpackages:
|
||||
|
|
@ -182,22 +208,17 @@ imports:
|
|||
- api/types/backend
|
||||
- api/types/blkiodev
|
||||
- api/types/container
|
||||
- api/types/events
|
||||
- api/types/filters
|
||||
- api/types/mount
|
||||
- api/types/network
|
||||
- api/types/reference
|
||||
- api/types/registry
|
||||
- api/types/strslice
|
||||
- api/types/swarm
|
||||
- api/types/time
|
||||
- api/types/versions
|
||||
- api/types/volume
|
||||
- builder
|
||||
- builder/dockerignore
|
||||
- cliconfig
|
||||
- cliconfig/configfile
|
||||
- client
|
||||
- daemon/graphdriver
|
||||
- image
|
||||
- image/v1
|
||||
|
|
@ -235,7 +256,6 @@ imports:
|
|||
- pkg/tarsum
|
||||
- pkg/term
|
||||
- pkg/term/windows
|
||||
- pkg/tlsconfig
|
||||
- pkg/urlutil
|
||||
- plugin/v2
|
||||
- reference
|
||||
|
|
@ -270,29 +290,6 @@ imports:
|
|||
version: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
|
||||
- name: github.com/docker/leadership
|
||||
version: bfc7753dd48af19513b29deec23c364bf0f274eb
|
||||
- name: github.com/docker/libcompose
|
||||
version: 7c59e343cd9d1f3f5577b5bfb71f6486beb4c006
|
||||
subpackages:
|
||||
- config
|
||||
- docker
|
||||
- docker/auth
|
||||
- docker/builder
|
||||
- docker/client
|
||||
- docker/container
|
||||
- docker/ctx
|
||||
- docker/image
|
||||
- docker/network
|
||||
- docker/service
|
||||
- docker/volume
|
||||
- labels
|
||||
- logger
|
||||
- lookup
|
||||
- project
|
||||
- project/events
|
||||
- project/options
|
||||
- utils
|
||||
- version
|
||||
- yaml
|
||||
- name: github.com/docker/libkv
|
||||
version: 35d3e2084c650109e7bcc7282655b1bc8ba924ff
|
||||
subpackages:
|
||||
|
|
@ -316,7 +313,7 @@ imports:
|
|||
- tokens
|
||||
- zones
|
||||
- name: github.com/elazarl/go-bindata-assetfs
|
||||
version: 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43
|
||||
version: 57eb5e1fc594ad4b0b1dbea7b286d299e0cb43c2
|
||||
- name: github.com/emicklei/go-restful
|
||||
version: 892402ba11a2e2fd5e1295dd633481f27365f14d
|
||||
subpackages:
|
||||
|
|
@ -325,9 +322,9 @@ imports:
|
|||
- name: github.com/gambol99/go-marathon
|
||||
version: 6b00a5b651b1beb2c6821863f7c60df490bd46c8
|
||||
- name: github.com/ghodss/yaml
|
||||
version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
|
||||
version: 04f313413ffd65ce25f2541bfd2b2ceec5c0908c
|
||||
- name: github.com/go-ini/ini
|
||||
version: 98c45284d68a05a0e0a576de574bd975946ef9ad
|
||||
version: 6f66b0e091edb3c7b380f7c4f0f884274d550b67
|
||||
- name: github.com/go-kit/kit
|
||||
version: f66b0e13579bfc5a48b9e2a94b1209c107ea1f41
|
||||
subpackages:
|
||||
|
|
@ -335,14 +332,19 @@ imports:
|
|||
- metrics/internal/lv
|
||||
- metrics/prometheus
|
||||
- name: github.com/go-openapi/jsonpointer
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 46af16f9f7b149af66e5d1bd010e3574dc06de98
|
||||
=======
|
||||
version: 779f45308c19820f1a69e9a4cd965f496e0da10f
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 8d96a2dc61536b690bd36b2e9df0b3c0b62825b2
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
- name: github.com/go-openapi/jsonreference
|
||||
version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272
|
||||
- name: github.com/go-openapi/spec
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 6aced65f8501fe1217321abf0749d354824ba2ff
|
||||
- name: github.com/go-openapi/swag
|
||||
|
|
@ -352,6 +354,11 @@ imports:
|
|||
- name: github.com/go-openapi/swag
|
||||
version: d5f8ebc3b1c55a4cf6489eeae7354f338cfe299e
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 34b5ffff717ab4535aef76e3dd90818bddde571b
|
||||
- name: github.com/go-openapi/swag
|
||||
version: 96d7b9ebd181a1735a1c9ac87914f2b32fbf56c9
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
- name: github.com/gogo/protobuf
|
||||
version: 909568be09de550ed094403c2bf8a261b5bb730a
|
||||
subpackages:
|
||||
|
|
@ -364,11 +371,11 @@ imports:
|
|||
subpackages:
|
||||
- proto
|
||||
- name: github.com/google/go-github
|
||||
version: 69fd0adc8ab606780549a072f2e3b3f795d75832
|
||||
version: c8ebe3a4d7f0791a6315b7410353d4084c58805d
|
||||
subpackages:
|
||||
- github
|
||||
- name: github.com/google/go-querystring
|
||||
version: 53e6ce116135b80d037921a7fdd5138cf32d7a8a
|
||||
version: 9235644dd9e52eeae6fa48efd539fdc351a0af53
|
||||
subpackages:
|
||||
- query
|
||||
- name: github.com/google/gofuzz
|
||||
|
|
@ -376,21 +383,22 @@ imports:
|
|||
- name: github.com/googleapis/gax-go
|
||||
version: 9af46dd5a1713e8b5cd71106287eba3cefdde50b
|
||||
- name: github.com/gorilla/context
|
||||
version: 215affda49addc4c8ef7e2534915df2c8c35c6cd
|
||||
version: 1ea25387ff6f684839d82767c1733ff4d4d15d0a
|
||||
- name: github.com/gorilla/websocket
|
||||
version: b258b4fadb573ac412f187b9f31974ea99d32f50
|
||||
version: 4873052237e4eeda85cf50c071ef33836fe8e139
|
||||
- name: github.com/hashicorp/consul
|
||||
version: 144a5e5340893a5e726e831c648f26dc19fef1e7
|
||||
version: fce7d75609a04eeb9d4bf41c8dc592aac18fc97d
|
||||
subpackages:
|
||||
- api
|
||||
- name: github.com/hashicorp/go-cleanhttp
|
||||
version: 3573b8b52aa7b37b9358d966a898feb387f62437
|
||||
version: 875fb671b3ddc66f8e2f0acc33829c8cb989a38d
|
||||
- name: github.com/hashicorp/go-version
|
||||
version: 03c5bf6be031b6dd45afec16b1cf94fc8938bc77
|
||||
version: e96d3840402619007766590ecea8dd7af1292276
|
||||
- name: github.com/hashicorp/serf
|
||||
version: 19f2c401e122352c047a84d6584dd51e2fb8fcc4
|
||||
version: 6c4672d66fc6312ddde18399262943e21175d831
|
||||
subpackages:
|
||||
- coordinate
|
||||
- serf
|
||||
- name: github.com/JamesClonk/vultr
|
||||
version: 9ec0427d51411407c0402b093a1771cb75af9679
|
||||
subpackages:
|
||||
|
|
@ -402,19 +410,23 @@ imports:
|
|||
- name: github.com/juju/ratelimit
|
||||
version: 77ed1c8a01217656d2080ad51981f6e99adaa177
|
||||
- name: github.com/mailgun/timetools
|
||||
version: 7e6055773c5137efbeb3bd2410d705fe10ab6bfd
|
||||
version: fd192d755b00c968d312d23f521eb0cdc6f66bd0
|
||||
- name: github.com/mailru/easyjson
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: d5b7844b561a7bc640052f1b935f7b800330d7e0
|
||||
=======
|
||||
version: db58e6f9072c545a3a24b8d44c51d81fff6dcb51
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 9d6630dc8c577b56cb9687a9cf9e8578aca7298a
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
subpackages:
|
||||
- buffer
|
||||
- jlexer
|
||||
- jwriter
|
||||
- name: github.com/mattn/go-shellwords
|
||||
version: 005a0944d84452842197c2108bd9168ced206f78
|
||||
version: 525bedee691b5a8df547cb5cf9f86b7fb1883e24
|
||||
- name: github.com/matttproud/golang_protobuf_extensions
|
||||
version: fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a
|
||||
subpackages:
|
||||
|
|
@ -442,33 +454,41 @@ imports:
|
|||
- records/state
|
||||
- util
|
||||
- name: github.com/Microsoft/go-winio
|
||||
version: fff283ad5116362ca252298cfc9b95828956d85d
|
||||
version: ce2922f643c8fd76b46cadc7f404a06282678b34
|
||||
- name: github.com/miekg/dns
|
||||
version: 8060d9f51305bbe024b99679454e62f552cd0b0b
|
||||
- name: github.com/mitchellh/mapstructure
|
||||
version: 53818660ed4955e899c0bcafa97299a388bd7c8e
|
||||
version: f3009df150dadf309fdee4a54ed65c124afad715
|
||||
- name: github.com/mvdan/xurls
|
||||
version: db96455566f05ffe42bd6ac671f05eeb1152b45d
|
||||
version: fa08908f19eca8c491d68c6bd8b4b44faea6daf8
|
||||
- name: github.com/NYTimes/gziphandler
|
||||
version: fb3533722e14198abe471546c9798fd556531451
|
||||
version: 6710af535839f57c687b62c4c23d649f9545d885
|
||||
- name: github.com/ogier/pflag
|
||||
version: 45c278ab3607870051a2ea9040bb85fcb8557481
|
||||
- name: github.com/opencontainers/runc
|
||||
version: 31980a53ae7887b2c8f8715d13c3eb486c27b6cf
|
||||
version: 1a81e9ab1f138c091fe5c86d0883f87716088527
|
||||
subpackages:
|
||||
- libcontainer/user
|
||||
- name: github.com/ovh/go-ovh
|
||||
version: d2207178e10e4527e8f222fd8707982df8c3af17
|
||||
version: a8a4c0bc40e56322142649bda7b2b4bb15145b6e
|
||||
subpackages:
|
||||
- ovh
|
||||
- name: github.com/pborman/uuid
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: ca53cad383cad2479bbba7f7a1a05797ec1386e4
|
||||
=======
|
||||
version: 1b00554d822231195d1babd97ff4a781231955c9
|
||||
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
|
||||
=======
|
||||
version: 5007efa264d92316c43112bc573e754bc889b7b1
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
- name: github.com/pkg/errors
|
||||
version: bfd5150e4e41705ded2129ec33379de1cb90b513
|
||||
- name: github.com/pmezard/go-difflib
|
||||
version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
|
||||
subpackages:
|
||||
- difflib
|
||||
- name: github.com/prometheus/client_golang
|
||||
version: c5b7fccd204277076155f10851dad72b76a49317
|
||||
subpackages:
|
||||
|
|
@ -490,7 +510,7 @@ imports:
|
|||
- name: github.com/PuerkitoBio/urlesc
|
||||
version: 5bd2802263f21d8788851d5305584c82a5c75d7e
|
||||
- name: github.com/pyr/egoscale
|
||||
version: 987e683a7552f34ee586217d1cc8507d52e80ab9
|
||||
version: ab4b0d7ff424c462da486aef27f354cdeb29a319
|
||||
subpackages:
|
||||
- src/egoscale
|
||||
- name: github.com/rancher/go-rancher
|
||||
|
|
@ -498,23 +518,23 @@ imports:
|
|||
subpackages:
|
||||
- client
|
||||
- name: github.com/ryanuber/go-glob
|
||||
version: 256dc444b735e061061cf46c809487313d5b0065
|
||||
version: 572520ed46dbddaed19ea3d9541bdd0494163693
|
||||
- name: github.com/samuel/go-zookeeper
|
||||
version: 177002e16a0061912f02377e2dd8951a8b3551bc
|
||||
version: e64db453f3512cade908163702045e0f31137843
|
||||
subpackages:
|
||||
- zk
|
||||
- name: github.com/satori/go.uuid
|
||||
version: 879c5887cd475cd7864858769793b2ceb0d44feb
|
||||
- name: github.com/Sirupsen/logrus
|
||||
version: f7f79f729e0fbe2fcc061db48a9ba0263f588252
|
||||
version: a283a10442df8dc09befd873fab202bf8a253d6a
|
||||
- name: github.com/spf13/pflag
|
||||
version: 5ccb023bc27df288a957c5e994cd44fd19619465
|
||||
- name: github.com/streamrail/concurrent-map
|
||||
version: 8bf1e9bacbf65b10c81d0f4314cf2b1ebef728b5
|
||||
version: 65a174a3a4188c0b7099acbc6cfa0c53628d3287
|
||||
- name: github.com/stretchr/objx
|
||||
version: cbeaeb16a013161a98496fad62933b1d21786672
|
||||
- name: github.com/stretchr/testify
|
||||
version: b8dc1cecf15bdaf1988d9e87aa7cd98d899a06d6
|
||||
version: 69483b4bd14f5845b5a1e55bca19e954e827f1d0
|
||||
subpackages:
|
||||
- assert
|
||||
- mock
|
||||
|
|
@ -531,11 +551,11 @@ imports:
|
|||
subpackages:
|
||||
- codec
|
||||
- name: github.com/unrolled/render
|
||||
version: 50716a0a853771bb36bfce61a45cdefdb98c2e6e
|
||||
version: 198ad4d8b8a4612176b804ca10555b222a086b40
|
||||
- name: github.com/vdemeester/docker-events
|
||||
version: be74d4929ec1ad118df54349fda4b0cba60f849b
|
||||
- name: github.com/vulcand/oxy
|
||||
version: f88530866c561d24a6b5aac49f76d6351b788b9f
|
||||
version: 9920d3561dd2a20cf74c0fe48ec9d3d94414daa1
|
||||
repo: https://github.com/containous/oxy.git
|
||||
vcs: git
|
||||
subpackages:
|
||||
|
|
@ -547,7 +567,7 @@ imports:
|
|||
- stream
|
||||
- utils
|
||||
- name: github.com/vulcand/predicate
|
||||
version: cb0bff91a7ab7cf7571e661ff883fc997bc554a3
|
||||
version: 19b9dde14240d94c804ae5736ad0e1de10bf8fe6
|
||||
- name: github.com/vulcand/route
|
||||
version: cb89d787ddbb1c5849a7ac9f79004c1fd12a4a32
|
||||
- name: github.com/vulcand/vulcand
|
||||
|
|
@ -614,6 +634,7 @@ imports:
|
|||
- unix
|
||||
- windows
|
||||
- name: golang.org/x/text
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
version: 2910a502d2bf9e43193af9d68ca516529614eed3
|
||||
subpackages:
|
||||
|
|
@ -625,6 +646,9 @@ imports:
|
|||
- secure/precis
|
||||
=======
|
||||
version: f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
|
||||
=======
|
||||
version: a49bea13b776691cb1b49873e5d8df96ec74831a
|
||||
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
|
||||
repo: https://github.com/golang/text.git
|
||||
vcs: git
|
||||
subpackages:
|
||||
|
|
@ -668,13 +692,17 @@ imports:
|
|||
- tap
|
||||
- transport
|
||||
- name: gopkg.in/fsnotify.v1
|
||||
version: 629574ca2a5df945712d3079857300b5e4da0236
|
||||
version: a8a77c9133d2d6fd8334f3260d06f60e8d80a5fb
|
||||
- name: gopkg.in/inf.v0
|
||||
version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
|
||||
- name: gopkg.in/ini.v1
|
||||
version: 98c45284d68a05a0e0a576de574bd975946ef9ad
|
||||
version: 6f66b0e091edb3c7b380f7c4f0f884274d550b67
|
||||
- name: gopkg.in/mgo.v2
|
||||
version: 29cc868a5ca65f401ff318143f9408d02f4799cc
|
||||
subpackages:
|
||||
- bson
|
||||
- name: gopkg.in/ns1/ns1-go.v2
|
||||
version: 49e3a8a0b594e847e01cdac77810ba49f9564ccf
|
||||
version: d8d10b7f448291ddbdce48d4594fb1b667014c8b
|
||||
subpackages:
|
||||
- rest
|
||||
- rest/model/account
|
||||
|
|
@ -683,7 +711,7 @@ imports:
|
|||
- rest/model/filter
|
||||
- rest/model/monitor
|
||||
- name: gopkg.in/square/go-jose.v1
|
||||
version: aa2e30fdd1fe9dd3394119af66451ae790d50e0d
|
||||
version: e3f973b66b91445ec816dd7411ad1b6495a5a2fc
|
||||
subpackages:
|
||||
- cipher
|
||||
- json
|
||||
|
|
@ -912,6 +940,25 @@ testImports:
|
|||
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
|
||||
|
|
@ -919,19 +966,19 @@ testImports:
|
|||
- name: github.com/gorilla/mux
|
||||
version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf
|
||||
- name: github.com/libkermit/compose
|
||||
version: d18cc8ec55cd7033d6c11c0db3b8f521ddbe339a
|
||||
version: cadc5a3b83a15790174bd7fbc75ea2529785e772
|
||||
subpackages:
|
||||
- check
|
||||
- name: github.com/libkermit/docker
|
||||
version: 4585c8ba51a219e3c8df6b9d355438e4d540fe70
|
||||
version: 55e3595409924fcfbb850811e5a7cdbe8960a0b7
|
||||
- name: github.com/libkermit/docker-check
|
||||
version: 182e98fd61f66048b3b794f7645b0262104cbf84
|
||||
version: cbe0ef03b3d23070eac4d00ba8828f2cc7f7e5a3
|
||||
- name: github.com/opencontainers/runtime-spec
|
||||
version: 4badf7fae7549a987581072b29d5e7b73a7bdaf5
|
||||
version: 06479209bdc0d4135911688c18157bd39bd99c22
|
||||
subpackages:
|
||||
- specs-go
|
||||
- name: github.com/vbatts/tar-split
|
||||
version: 7560005f21d918cc59698527424fc6759877152f
|
||||
version: 6810cedb21b2c3d0b9bb8f9af12ff2dc7a2f14df
|
||||
subpackages:
|
||||
- archive/tar
|
||||
- tar/asm
|
||||
|
|
@ -939,11 +986,11 @@ testImports:
|
|||
- name: github.com/vdemeester/shakers
|
||||
version: 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
|
||||
- name: github.com/xeipuuv/gojsonpointer
|
||||
version: 6fe8760cad3569743d51ddbb243b26f8456742dc
|
||||
version: e0fe6f68307607d540ed8eac07a342c33fa1b54a
|
||||
- name: github.com/xeipuuv/gojsonreference
|
||||
version: e02fc20de94c78484cd5ffb007f8af96be030a45
|
||||
- name: github.com/xeipuuv/gojsonschema
|
||||
version: ff0417f4272e480246b4507459b3f6ae721a87ac
|
||||
version: 00f9fafb54d2244d291b86ab63d12c38bd5c3886
|
||||
- name: golang.org/x/time
|
||||
version: a4bde12657593d5e90d0533a3e4fd95e635124cb
|
||||
subpackages:
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import:
|
|||
- package: github.com/cenk/backoff
|
||||
- package: github.com/containous/flaeg
|
||||
- package: github.com/vulcand/oxy
|
||||
version: f88530866c561d24a6b5aac49f76d6351b788b9f
|
||||
version: 9920d3561dd2a20cf74c0fe48ec9d3d94414daa1
|
||||
repo: https://github.com/containous/oxy.git
|
||||
vcs: git
|
||||
subpackages:
|
||||
|
|
@ -35,15 +35,12 @@ import:
|
|||
- package: github.com/docker/go-units
|
||||
version: 0dadbb0345b35ec7ef35e228dabb8de89a65bf52
|
||||
- package: github.com/docker/libkv
|
||||
version: 35d3e2084c650109e7bcc7282655b1bc8ba924ff
|
||||
subpackages:
|
||||
- store
|
||||
- store/boltdb
|
||||
- store/consul
|
||||
- store/etcd
|
||||
- store/zookeeper
|
||||
- package: github.com/docker/libcompose
|
||||
version: v0.4.0
|
||||
- package: github.com/elazarl/go-bindata-assetfs
|
||||
- package: github.com/containous/mux
|
||||
- package: github.com/hashicorp/consul
|
||||
|
|
@ -89,7 +86,6 @@ import:
|
|||
- package: github.com/abbot/go-http-auth
|
||||
- package: github.com/NYTimes/gziphandler
|
||||
- package: github.com/docker/leadership
|
||||
version: bfc7753dd48af19513b29deec23c364bf0f274eb
|
||||
- package: github.com/satori/go.uuid
|
||||
version: ^1.1.0
|
||||
- package: k8s.io/client-go
|
||||
|
|
|
|||
Loading…
Reference in a new issue