baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
5173 commits 1 branch 0 tags 84 MiB
Commit graph

5173 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Tootill
53c99f7469 Add moul/http2curl to glide.yaml 2016-04-27 10:24:00 -07:00
David Tootill
f93e618f67 Merge remote-tracking branch 'refs/remotes/containous/master' 
# Conflicts:
#	glide.lock
#	glide.yaml
 2016-04-27 09:41:51 -07:00
David Tootill
64b78461f6 Remove some debug logs (requested in review) 2016-04-27 09:25:13 -07:00
Vincent Demeester
2f5c9273ee Merge pull request #334 from containous/fix-k8s-watch-ssl 
Fix Kubernetes watch SSL & empty schema
 2016-04-27 10:20:26 +02:00
Emile Vauge
38371234a2
Add logo credits 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-27 10:05:04 +02:00
Emile Vauge
10cb606578
Add Kubernetes URL 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-27 10:05:04 +02:00
Emile Vauge
87caf458df
Fix Kubernetes schema 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-27 10:05:04 +02:00
Emile Vauge
4ff4e4e626
Fix Kubernetes watch SSL 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-27 10:05:04 +02:00
Vincent Demeester
9053f9bb98 Merge pull request #335 from tboerger/feature/libkv-update 
Updated libkv dependency
 2016-04-27 09:57:38 +02:00
Thomas Boerger
b6b72c861f
Replaced etcd-go with etcd/client 
In order to meet the requirements of the updated libkv library I have
also replaced etcd-go with the up2date etcd client.

Signed-off-by: Thomas Boerger <thomas@webhippie.de>
 2016-04-26 23:18:53 +02:00
Thomas Boerger
478eed6603
Updated libkv dependency 
In order to fix the TLS client authentication I have updated the libkv
dependency. Now the connection to secured etcd and consuld should work
properly.

Signed-off-by: Thomas Boerger <thomas@webhippie.de>
 2016-04-26 22:37:19 +02:00
Vincent Demeester
6b76f64b48 Merge pull request #186 from containous/add-kubernetes-ingress-support 
Add kubernetes Ingress backend
 2016-04-25 18:40:29 +02:00
Emile Vauge
53a2787626
Fix watch pods/services/rc/ingresses 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-25 17:13:26 +02:00
Emile Vauge
cac9927395
Fix namespace, fix PathPrefixStrip 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Emile Vauge
9e14619a0b
Add doc 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Emile Vauge
c0dd4c3209
Add unit test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Emile Vauge
d82e1342fb
Fix integration test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
emile
720912e880
Add kubernetes Ingress backend 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Vincent Demeester
6f47434833 Merge pull request #328 from samber/consul-catalog--remove-disable-frontend 
feat(consul-catalog): Remove frontend when backends disabled
 2016-04-22 12:09:14 +02:00
Poney baker
6f13a2c0c7 feat(consul-catalog): Remove frontend when backends disabled 2016-04-22 11:55:31 +02:00
Vincent Demeester
b7a150bc64 Merge pull request #327 from pborreli/typos 
Fixed typos
 2016-04-22 11:38:02 +02:00
Pascal Borreli
4d22c45b76 Fixed typos 2016-04-21 23:38:44 +01:00
David Tootill
2a76a717e6 Add access log integration test 2016-04-20 11:54:57 -07:00
Vincent Demeester
b3b658a955 Merge pull request #324 from containous/fix-kv-backend 
Fix KV backend
 2016-04-20 08:01:32 +02:00
David Tootill
c8c0d208be Update glide files for mattn/shellwords 2016-04-20 01:36:51 +00:00
David Tootill
04dd41ac3b Minor corrections 2016-04-20 01:25:22 +00:00
David Tootill
10815eca8e Initial update - manage access log 2016-04-19 16:45:59 -07:00
Emile Vauge
06d2f343dd
Fix KV backend 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-19 23:49:26 +02:00
Vincent Demeester
a6c5e85ae7 Merge pull request #320 from samber/consul-provider-compare-tag-lowercase 
fix(consul-provider): Compare consul catalog tag keys with lowered case
 2016-04-19 18:23:47 +02:00
Samuel BERTHE
45d6a326cd fix(consul-provider): Compare consul catalog tag keys with lowered case 2016-04-19 17:27:19 +02:00
Vincent Demeester
0332e32293 Merge pull request #322 from containous/fix-marathon-backend 
Fix Marathon backend
 2016-04-19 12:32:56 +02:00
Emile Vauge
2a3a34a80c
Fix Marathon backend 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-19 12:05:28 +02:00
Emile Vauge
68da47b59a Merge pull request #321 from samber/minor-doc-fix 
fix(doc)
 2016-04-19 12:04:13 +02:00
Samuel BERTHE
b1f0f048cd fix(doc) 2016-04-19 10:00:33 +02:00
Marcus Stong
a7b4463f86 #304: enhance acme documentation 2016-04-18 12:31:45 -04:00
Vincent Demeester
ee60adc45a Merge pull request #315 from containous/add-backoff-marathon 
Add backoff to marathon provider
 2016-04-16 17:32:01 +02:00
Emile Vauge
36338b4928
add backoff to marathon provider 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-16 17:21:24 +02:00
Emile Vauge
23d3c512c2 Merge pull request #316 from vdemeester/docker-provider-stop-support 
Support stop chan on docker provider
 2016-04-16 17:20:55 +02:00
Vincent Demeester
4144638be4
Support stop chan on docker provider 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-16 14:46:35 +02:00
Emile Vauge
f2320ee648 Merge pull request #313 from containous/add-user-guide 
Add doc user guide with swarm
 2016-04-15 19:13:53 +02:00
Emile Vauge
17afa3e672
Add doc user guide with swarm 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-15 19:00:08 +02:00
Vincent Demeester
5b2c355c38 Merge pull request #305 from containous/fix-races 
Fix races
 2016-04-15 18:09:50 +02:00
Emile Vauge
61d54903e3
Fix doc 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
Emile Vauge
c1078c4374
Fix races 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
Emile Vauge
4e427b5a9e
remove error oxy log 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
Vincent Demeester
227ec71db3 Merge pull request #306 from kevioke/oxy-glide-update 
Update glide files to use most recent version of containous/oxy
 2016-04-14 15:08:31 +02:00
kevin
d047b8daa1 Update glide files to use most recent version of containous/oxy 2016-04-13 14:51:14 -07:00
Emile Vauge
c2009b71b1 Merge pull request #303 from containous/emilevauge-bump-go1.6.1 
Bump to go v1.6.1
 2016-04-13 21:28:53 +02:00
Emile Vauge
ba8629e2ac
Bump to go v1.6.1 2016-04-13 21:09:39 +02:00
Vincent Demeester
6aba453afb Merge pull request #301 from kevioke/maxconns 
Add support for maximum connections for backends.
 2016-04-13 18:50:29 +02:00