1
0
Fork 0

Merge branch 'v1.3'

This commit is contained in:
Fernandez Ludovic 2017-06-27 14:42:12 +02:00
commit 73e10c96cc
14 changed files with 303 additions and 41 deletions

6
glide.lock generated
View file

@ -1,5 +1,5 @@
hash: 088194c8357ca08e27476866b9007adfa7711500fe0c78650ecb397c4f70075a
updated: 2017-05-19T23:30:19.890844996+02:00
hash: 068db16642eb0249ce973711f4cf44206cc201214b1990e13f89e1ac3c402635
updated: 2017-06-27T00:25:19.890844996+02:00
imports:
- name: cloud.google.com/go
version: 2e6a95edb1071d750f6d7db777bf66cd2997af6c
@ -409,7 +409,7 @@ imports:
- name: github.com/vdemeester/docker-events
version: be74d4929ec1ad118df54349fda4b0cba60f849b
- name: github.com/vulcand/oxy
version: f88530866c561d24a6b5aac49f76d6351b788b9f
version: ad5bdb606fa9c64db267f0e43d63834908bdb05e
repo: https://github.com/containous/oxy.git
vcs: git
subpackages: