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

2342 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
bc6f764a87 Merge pull request #1578 from Stibbons/marathon_doc 
Add Marathon guide.
 2017-05-17 15:21:09 +02:00
Gaetan Semet
0b414ed482
Add Marathon guide 
Copy/pasted from very comprehensive slack response from @ttr
https://traefik.slack.com/archives/C0CDT22PJ/p1494347929571784?thread_ts=1494339388.375916&cid=C0CDT22PJ

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2017-05-17 14:59:28 +02:00
Ludovic Fernandez
ff3481f06b Merge pull request #1613 from containous/merge-v1.3.0-rc2-master 
Merge v1.3.0-rc2 master
 2017-05-17 12:41:26 +02:00
Emile Vauge
f8ea19d29c
Merge branch 'v1.3' into merge-v1.3.0-rc2-master 2017-05-17 11:44:53 +02:00
Ludovic Fernandez
3b8ebf7d33 Merge pull request #1603 from antoine-aumjaud/patch-1 
Small toml documentation update
 2017-05-17 10:03:57 +02:00
Antoine Aumjaud
5e14f20786 Update documentation 
fix some "errors"
 2017-05-17 09:45:36 +02:00
Thomas Recloux
96b19deac5 Merge pull request #1616 from containous/remove-trecloux-maintainers 
Remove Thomas Recloux from maintainers
 2017-05-16 23:42:16 +02:00
Emile Vauge
a6aff7c85c
Remove Thomas Recloux from maintainers 2017-05-16 23:20:29 +02:00
Emile Vauge
1310347395 Remove Russell from maintainers (#1614) 
It's been a pleasure
 2017-05-16 18:10:28 +01:00
Ludovic Fernandez
40c94d80d7 Merge pull request #1582 from ldez/doc/maintainer-labels 
doc: add labels documentation.
 2017-05-16 17:59:30 +02:00
Emile Vauge
f521e72f15 Merge pull request #1612 from containous/fix-deploy 
Fix deploy script, removes Docker version check
 2017-05-16 17:53:47 +02:00
Emile Vauge
88ea0a037b
Fix deploy script, removes Docker version check 2017-05-16 17:24:08 +02:00
Emile Vauge
c963cee3c8 Merge pull request #1606 from containous/prepare-release-v1.3.0-rc2 
Prepare release v1.3.0-rc2
 2017-05-16 16:15:05 +02:00
Emile Vauge
0be353d435
Merge pull request #1610 from ldez/beta-cluster 
doc: Traefik cluster in beta.
 2017-05-16 15:50:03 +02:00
Emile Vauge
6afff2d403 Merge pull request #1610 from ldez/beta-cluster 
doc: Traefik cluster in beta.
 2017-05-16 15:47:11 +02:00
Fernandez Ludovic
12fa144f2f doc: Traefik cluster in beta. 2017-05-16 15:28:18 +02:00
Emile Vauge
ac0e48b48c Merge pull request #1608 from ldez/feat-semaphoreci 
SemaphoreCI on 1.3 branch
 2017-05-16 15:08:39 +02:00
Attilio Borello
64aa37858b added retry function to validate script 2017-05-16 14:33:06 +02:00
Attilio Borello
5348d4dccd added retry function to tests script 2017-05-16 14:33:06 +02:00
Attilio Borello
c3c599241f removed unit and integration tests from travis 2017-05-16 14:33:06 +02:00
Attilio Borello
c19432f95c clean up apt-cache in webui/Dockerfile 2017-05-16 14:33:06 +02:00
Attilio Borello
bdf4f48d78 replaced docker images with alpine if available (nginx, rabbitmq) 2017-05-16 14:33:06 +02:00
Attilio Borello
21aa0ea2da added DOCKER_VERSION variable 2017-05-16 14:33:06 +02:00
Fernandez Ludovic
921a704c24 doc: add labels documentation. 2017-05-16 14:21:26 +02:00
Emile Vauge
3f490f95c6 Merge pull request #1589 from containous/add-ldez-maintainers 
Add @ldez to maintainers
 2017-05-16 11:26:54 +02:00
Emile Vauge
24d80b1909
Add @ldez to maintainers 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-16 11:06:59 +02:00
Timo Reimann
f8e7b5595b Merge pull request #1585 from timoreimann/1-3-maintain-sticky-flag-on-lb-method-validation-failure 
Maintain sticky flag on LB method validation failure.
 2017-05-16 00:41:15 +02:00
Timo Reimann
f9839f7b1d Turn configureBackends into method. 2017-05-16 00:06:42 +02:00
Timo Reimann
2c45428c8a Maintain sticky flag on LB method validation failure. 
We previously did not copy the sticky flag if the load-balancer
method validation failed, causing enabled stickiness to be dropped in
case of a validation error (which, technically, for us is the same as a
load-balancer configuration without an explicitly set method). This
change fixes that.

A few refactorings and improvements along the way:

- Move the frontend and backend configuration steps into separate
  methods/functions for better testability.
- Include the invalid method name in the error value and avoid log
  duplication.
- Add tests for the backend configuration part.
 2017-05-16 00:06:42 +02:00
Emile Vauge
30aa5a82b3 Merge pull request #1577 from aantono/Issue1569 
Fixed ReplacePath rule executing out of order, when combined with PathPrefixStrip
 2017-05-15 23:21:53 +02:00
Alex Antonov
3f68e382fd Fixed ReplacePath rule executing out of order, when combined with PathPrefixStrip #1569 2017-05-15 10:08:18 -05:00
Emile Vauge
9e57a283d7 Merge pull request #1601 from containous/fix-fatal-auth 
Fix empty basic auth
 2017-05-15 17:00:52 +02:00
Emile Vauge
eaedc1b924
Fix empty basic auth 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-15 16:03:46 +02:00
Emile Vauge
e3ab4e4d63 Merge pull request #1598 from containous/fix-stats-hijack 
Fix stats hijack
 2017-05-15 15:04:23 +02:00
Emile Vauge
48a91d05b5
Add Recover tests 2017-05-15 09:17:33 +02:00
Emile Vauge
111251da05
Adds Panic Recover middleware 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-15 09:17:33 +02:00
Emile Vauge
71cec1580b
Fix stats responseRecorder Hijacker 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-05-15 09:17:33 +02:00
Ludovic Fernandez
78b2fba033 Merge pull request #1595 from ldez/refactor/remove-legacy-ci-data 
chore(CI): remove old CI data.
 2017-05-12 20:32:29 +02:00
Fernandez Ludovic
218b76275c chore(CI): remove old CI data. 2017-05-12 19:16:36 +02:00
Ludovic Fernandez
cf5b6d837f Merge pull request #1594 from ldez/doc/semaphoreci-badge 
doc(CI): Add SemaphoreCI badge.
 2017-05-12 19:04:00 +02:00
Fernandez Ludovic
0babc7bb64 doc(CI): Add SemaphoreCI badge. 2017-05-12 18:46:02 +02:00
Ludovic Fernandez
8a551d91fd Merge pull request #1573 from atbore-phx/ci-retry-tests 
[CI] retry function
 2017-05-12 17:41:21 +02:00
Attilio Borello
eeed035ef0 added retry function to validate script 2017-05-12 17:18:47 +02:00
Attilio Borello
33404a7772 added retry function to tests script 2017-05-12 17:18:47 +02:00
Ludovic Fernandez
bd90745528 Merge pull request #1593 from atbore-phx/ci-switch 
[CI] removed unit and integration tests from travis
 2017-05-12 17:17:00 +02:00
Attilio Borello
ede1212cb0 removed unit and integration tests from travis 2017-05-12 16:19:35 +02:00
Ludovic Fernandez
2dcbc01e51 Merge pull request #1544 from maxwo/proxy-dev-mode 
Proxy in dev mode
 2017-05-12 10:11:58 +02:00
Maxime Wojtczak
61ba50fac9 feat(Dev proxy) : Add proxy to localhost:8080 in dev mode. 2017-05-12 09:41:22 +02:00
Ludovic Fernandez
b24b5e20b4 Merge pull request #1548 from timoreimann/kubernetes-ignore-missing-pass-host-header-annotation 
Merge v1.3 branch into master [2017-05-11]
 2017-05-12 00:36:52 +02:00
Emile Vauge
ffe1104851 Merge pull request #1588 from containous/fix-exported-fields-providers 
Fix exported fields providers
 2017-05-11 22:58:00 +02:00