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

795 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge a1ab252303
Fix empty tls flag 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-05 10:56:48 +02:00
Emile Vauge 3c89fd51ee Merge pull request #491 from containous/fix-default-weight-in-loadConfig 
Fix default weight in server.LoadConfig
 2016-07-05 10:56:26 +02:00
Emile Vauge 018b8a6315
Fix default weight in server.LoadConfig 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-05 10:26:28 +02:00
Emile Vauge ecaa146d5b Merge pull request #492 from containous/fix-webui-proxy 
Fix webui proxying
 2016-07-05 10:17:49 +02:00
Emile Vauge f50a4d8c2a
Fix webui proxying 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-05 09:34:17 +02:00
Emile Vauge 68b0e44fbd Merge pull request #490 from containous/fix-retry-headers 
Fix retry headers, simplify ResponseRecorder
 2016-07-05 09:18:36 +02:00
Emile Vauge ac9946c697
Fix retry headers, simplify ResponseRecorder 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-04 19:32:19 +02:00
Vincent Demeester a0a8bc24e8 Merge pull request #479 from containous/disable-constraints-temporarily 
Disable constraints in doc until 1.1
 2016-06-23 17:46:05 +02:00
Emile Vauge 06ab802bc6
Disable constraints in doc until 1.1 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-23 17:25:12 +02:00
Vincent Demeester 04ec757083 Merge pull request #477 from containous/fix-spamming-events 
Fix spamming events in listenProviders
 2016-06-23 17:09:59 +02:00
Emile Vauge 15e04bb55d
Fix consul catalog issue with dot in serviceName 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-23 16:33:54 +02:00
Emile Vauge e4ed7fd8f7
Fix bad circuit breaker expression 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-23 16:33:54 +02:00
Emile Vauge fd5352b0c6
Fix empty rule 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-23 16:33:54 +02:00
Emile Vauge 606e667b88
Fix spamming events in listenProviders 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-23 16:33:54 +02:00
Vincent Demeester 2a209c23c4 Merge pull request #478 from keis/consul-stable-ordering-of-nodes 
Sort nodes before creating consul catalog config
 2016-06-23 16:33:22 +02:00
David Keijser 70305266dc Sort nodes before creating consul catalog config 
The watch of consul can return for various reasons and not of all of
them require a reload of the config. The order of nodes provided by
consul is not stable so to ensure a identical config is generated for an
identical server set the nodes needs to be sorted before creating the
config.
 2016-06-23 13:08:12 +02:00
Vincent Demeester 8e561d9f95 Merge pull request #441 from NicolasGeraud/patch-1 
mount acme folder instead of file
 2016-06-23 10:00:09 +02:00
Nicolas Géraud f446cac43c mount acme folder instead of file 
I you use traefik in Docker and use Let's Encrypt, you have to mount the folder containing the acme.json file instead of the file itself.
 2016-06-23 00:02:01 +02:00
Vincent Demeester 7e1ceb9a3e Merge pull request #476 from containous/fix-empty-response 
Fix empty responses
 2016-06-22 16:39:40 +02:00
Emile Vauge 1b5e35461d
Bump oxy to b57d6706e9ff606343c596940b60df7f90012d29 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-22 15:33:39 +02:00
Vincent Demeester df75700015 Merge pull request #468 from containous/fix-marathon-tls-auth 
Fix marathon TLS/basic auth
 2016-06-22 14:23:16 +02:00
Emile Vauge b586df6689
Fix marathon tests 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-22 13:56:28 +02:00
Emile Vauge 4ca2ff0495
Bump go-marathon a558128c87724cd7430060ef5aedf39f83937f55, add DCOS support 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-20 17:11:32 +02:00
Emile Vauge 93494c7e35 Fix errors load config (#470) 
* Trim spaces in rules

Signed-off-by: Emile Vauge <emile@vauge.com>

* dont break the whole config while only one part is wrong

Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-20 15:19:52 +02:00
Emile Vauge 11874bc4ae Fix acme renew, add test (#472) 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-20 13:55:50 +02:00
Kevin Busse dcf98d13c8 Fix typo in error message. (#471) 2016-06-20 12:15:31 +02:00
Vincent Demeester 2a735e815a Merge pull request #469 from kumy/patch-1 
Typo: Replace French words by English ones
 2016-06-18 16:24:54 +02:00
kumy 52de16b4c9 Merge branch 'master' into patch-1 2016-06-18 16:06:49 +02:00
Vincent Demeester 7133a28fdb Merge pull request #460 from containous/fix-websocket-hijack 
Fix websocket connection Hijack
 2016-06-18 15:50:30 +02:00
kumy ade2ff97e0 Typo: Replace French words by English ones 2016-06-18 15:43:35 +02:00
Emile Vauge 450d86be7d
Fix websocket connection Hijack 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-18 13:37:21 +02:00
Vincent Demeester c9caf612eb Merge pull request #464 from containous/fix-memory-leak 
Fix memory leak in listenProviders
 2016-06-17 00:52:21 +02:00
Emile Vauge 56ef678c09
Fix memory leak in listenProviders 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-16 22:49:57 +02:00
Emile Vauge 29e647763a Merge pull request #438 from samber/TRAEFIK-311--support-docker-backend 
feat(constraints): Supports constraints for docker backend
 2016-06-13 00:29:28 +02:00
Samuel BERTHE 357150bcab fix(constainrs,docker): Syntax 2016-06-11 19:06:39 +02:00
Samuel BERTHE f7224ff403 feat(constraints): Supports constraints for docker backend 2016-06-11 19:06:39 +02:00
Vincent Demeester 01ffad2e6e Merge pull request #450 from containous/fix-default-kv-configuration 
Fix default KV configuration
 2016-06-11 15:03:57 +02:00
Emile Vauge 223e8cafac
Fix default KV configuration 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-09 23:44:49 +02:00
Emile Vauge d1ffbd8a03 Merge pull request #443 from vdemeester/442-and-share-context 
Fix panic if listContainers fails…
 2016-06-09 09:37:48 +02:00
Vincent Demeester f286cb9a34
Fix panic if listContainers fails… 
… and also share context accross API call, as this is how it's meant to
be used (and it allows to skip some calls if `cancel` is called).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-08 19:39:38 +02:00
Emile Vauge 5c63855cc0
Merge branch 'AlmogBaku-master' 2016-06-07 20:19:51 +02:00
Emile Vauge 2a96ae9ec2
Merge branch 'master' of https://github.com/AlmogBaku/traefik into AlmogBaku-master 2016-06-07 20:19:21 +02:00
Samuel BERTHE 36a2da0659 Merge pull request #440 from containous/emilevauge-add-samber-to-maintainers 
Add @samber to maintainers
 2016-06-07 20:15:08 +02:00
Emile Vauge 38abec520c Add @samber to maintainers 2016-06-07 19:45:12 +02:00
Almog Baku 1274d26b4c Merge branch 'master' into master 2016-06-07 19:45:53 +03:00
Vincent Demeester 6556c79207 Merge pull request #433 from containous/add-routes-priorities 
Add routes priorities
 2016-06-07 10:10:19 +02:00
Emile Vauge 7e6c580130
Add routes priorities in documentation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:54:12 +02:00
Emile Vauge cc4fb64b34
Add routes priorities in integration tests 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00
Emile Vauge f4cb4bb1b8
Add routes priorities in providers 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00
Emile Vauge 287b3ba1f4
Add routes priorities test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00