baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

update oxy hash

Browse source
This commit is contained in:
dtomcej 2017-03-02 14:59:19 -07:00 committed by Emile Vauge
parent 8d650da2f8
commit ef83a5936d
No known key found for this signature in database
GPG key ID: D808B4C167352E59
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
glide.lock generated
View file

@ -1,10 +1,15 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
hash: b1cbcbd938a47a246b0d4d634037b76e63486c63e5867b339f92bcbd7453b75c hash: b1cbcbd938a47a246b0d4d634037b76e63486c63e5867b339f92bcbd7453b75c
updated: 2017-04-07T11:34:46.101385591+01:00 updated: 2017-04-07T11:34:46.101385591+01:00
======= =======
hash: b4e99f1210c5bfb7784b55c9ec5b54629fadaea0625b29e540979b1acbd7dc09 hash: b4e99f1210c5bfb7784b55c9ec5b54629fadaea0625b29e540979b1acbd7dc09
updated: 2017-03-02T09:39:03.718549862+01:00 updated: 2017-03-02T09:39:03.718549862+01:00
>>>>>>> 9af5ba3... Bump go-rancher version >>>>>>> 9af5ba3... Bump go-rancher version
=======
hash: 6d21d24827ef1c9321e8a41a328c42f891281af2ea68841d42411f23b0666d4b
updated: 2017-03-02T14:57:08.032744661-07:00
>>>>>>> eebbf6e... update oxy hash
imports: imports:
- name: bitbucket.org/ww/goautoneg - name: bitbucket.org/ww/goautoneg
version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675
@ -403,7 +408,7 @@ imports:
- name: github.com/vdemeester/docker-events - name: github.com/vdemeester/docker-events
version: be74d4929ec1ad118df54349fda4b0cba60f849b version: be74d4929ec1ad118df54349fda4b0cba60f849b
- name: github.com/vulcand/oxy - name: github.com/vulcand/oxy
version: fcc76b52eb8568540a020b7a99e854d9d752b364 version: 9920d3561dd2a20cf74c0fe48ec9d3d94414daa1
repo: https://github.com/containous/oxy.git repo: https://github.com/containous/oxy.git
vcs: git vcs: git
subpackages: subpackages:

2
glide.yaml
View file

@ -8,7 +8,7 @@ import:
- package: github.com/cenk/backoff - package: github.com/cenk/backoff
- package: github.com/containous/flaeg - package: github.com/containous/flaeg
- package: github.com/vulcand/oxy - package: github.com/vulcand/oxy
version: fcc76b52eb8568540a020b7a99e854d9d752b364 version: 9920d3561dd2a20cf74c0fe48ec9d3d94414daa1
repo: https://github.com/containous/oxy.git repo: https://github.com/containous/oxy.git
vcs: git vcs: git
subpackages: subpackages: