homelab/traefik
1
0
Fork 0
Code Activity

Merge remote-tracking branch 'refs/remotes/containous/master'

Browse source 
# Conflicts:
#	glide.lock
#	glide.yaml
This commit is contained in:
David Tootill 2016-04-27 09:41:51 -07:00
commit f93e618f67
33 changed files with 1622 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

14
glide.yaml
View file

@ -1,9 +1,9 @@
package: main
import:
- package: github.com/coreos/go-etcd
version: cc90c7b091275e606ad0ca7102a23fb2072f3f5e
- package: github.com/coreos/etcd
version: 26e52d2bce9e3e11b77b68cc84bf91aebb1ef637
subpackages:
- etcd
- client
- package: github.com/mailgun/log
version: 44874009257d4d47ba9806f1b7f72a32a015e4d8
- package: github.com/containous/oxy
@ -33,7 +33,7 @@ import:
- package: github.com/gorilla/handlers
version: 40694b40f4a928c062f56849989d3e9cd0570e5f
- package: github.com/docker/libkv
version: 3732f7ff1b56057c3158f10bceb1e79133025373
version: 7283ef27ed32fe267388510a91709b307bb9942c
- package: github.com/alecthomas/template
version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0
- package: github.com/vdemeester/shakers
@ -102,7 +102,7 @@ import:
- package: github.com/codegangsta/negroni
version: c7477ad8e330bef55bf1ebe300cf8aa67c492d1b
- package: gopkg.in/yaml.v2
version: 7ad95dd0798a40da1ccdff6dff35fd177b5edf40
version: 7ad95dd0798a40da1ccdff6dff35fd177b5edf
- package: github.com/opencontainers/runc
version: 4ab132458fc3e9dbeea624153e0331952dc4c8d5
subpackages:
@ -114,7 +114,7 @@ import:
- package: github.com/elazarl/go-bindata-assetfs
version: d5cac425555ca5cf00694df246e04f05e6a55150
- package: github.com/BurntSushi/toml
version: bd2bdf7f18f849530ef7a1c29a4290217cab32a1
version: bbd5bb678321a0d6e58f1099321dfa73391c1b6f
- package: gopkg.in/alecthomas/kingpin.v2
version: 639879d6110b1b0409410c7b737ef0bb18325038
- package: github.com/cenkalti/backoff
@ -166,6 +166,7 @@ import:
subpackages:
- reference
- package: github.com/docker/engine-api
version: 8924d6900370b4c7e7984be5adc61f50a80d7537
subpackages:
- client
- types
@ -181,4 +182,5 @@ import:
- package: github.com/docker/go-units
- package: github.com/mailgun/multibuf
- package: github.com/streamrail/concurrent-map
- package: github.com/parnurzeal/gorequest
- package: github.com/mattn/go-shellwords