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

bump lego 0e2937900

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2017-03-27 14:39:14 +02:00
parent f2297dd3ed
commit 87ce060737
No known key found for this signature in database
GPG key ID: D808B4C167352E59
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
glide.lock generated
View file

@ -3,6 +3,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< 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
======= =======
@ -25,6 +26,10 @@ updated: 2017-03-02T14:57:08.032744661-07:00
hash: 741ec5fae23f12e6c0fa0e4c7c00c0af06fac1ddc199dd4b45c904856890b347 hash: 741ec5fae23f12e6c0fa0e4c7c00c0af06fac1ddc199dd4b45c904856890b347
updated: 2017-03-15T10:48:05.202095822+01:00 updated: 2017-03-15T10:48:05.202095822+01:00
>>>>>>> 7c55a4f... Update github.com/containous/oxy only. >>>>>>> 7c55a4f... Update github.com/containous/oxy only.
=======
hash: b689cb0faed68086641d9e3504ee29498e5bf06b088ad4fcd1e76543446d4d9a
updated: 2017-03-27T14:29:54.009570184+02:00
>>>>>>> 0d657a0... bump lego 0e2937900
imports: imports:
- name: bitbucket.org/ww/goautoneg - name: bitbucket.org/ww/goautoneg
version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675
@ -197,7 +202,14 @@ imports:
>>>>>>> 8392846... Update vulcand and pin deps in glide.yaml >>>>>>> 8392846... Update vulcand and pin deps in glide.yaml
======= =======
version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a version: 9ed569b5d1ac936e6494082958d63a6aa4fff99a
<<<<<<< HEAD
>>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2. >>>>>>> 7b1c0a9... Reset glide files to versions from upstream/v1.2.
=======
- name: github.com/dnsimple/dnsimple-go
version: eeb343928d9a3de357a650c8c25d8f1318330d57
subpackages:
- dnsimple
>>>>>>> 0d657a0... bump lego 0e2937900
- name: github.com/docker/distribution - name: github.com/docker/distribution
version: 325b0804fef3a66309d962357aac3c2ce3f4d329 version: 325b0804fef3a66309d962357aac3c2ce3f4d329
subpackages: subpackages:
@ -583,7 +595,11 @@ imports:
- plugin/rewrite - plugin/rewrite
- router - router
- name: github.com/xenolf/lego - name: github.com/xenolf/lego
<<<<<<< HEAD
version: 5dfe609afb1ebe9da97c9846d97a55415e5a5ccd version: 5dfe609afb1ebe9da97c9846d97a55415e5a5ccd
=======
version: 0e2937900b224325f4476745a9b53aef246b7410
>>>>>>> 0d657a0... bump lego 0e2937900
subpackages: subpackages:
- acme - acme
- providers/dns - providers/dns