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

3555 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
6e484e5c2d
add let's encrypt support 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-21 20:15:28 +01:00
Emile Vauge
087b68e14d Merge pull request #251 from sample/master 
Add defaultExpose option to marathon section
 2016-03-21 14:01:57 +01:00
Nikita Borzykh
c313950891 Add exposedByDefault option to marathon section 2016-03-21 12:37:02 +03:00
Vincent Demeester
7716d3377a Merge pull request #256 from containous/move-to-containous-oxy 
Move to containous/oxy
 2016-03-16 11:41:20 +01:00
Emile Vauge
0cbe34eef3
Move to containous/oxy, remove websocket specific support 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-15 23:42:52 +01:00
Vincent Demeester
08d8c334a3 Merge pull request #255 from containous/Fix-remove-travis-build-tag 
Avoid travis building on tags
 2016-03-14 18:28:51 +01:00
Emile Vauge
d75a151df3 Avoid travis building on tags 
due to https://github.com/travis-ci/travis-ci/issues/1532
 2016-03-14 17:36:12 +01:00
Emile Vauge
10e223ede2 Merge pull request #246 from keis/new-style-argument-systemd 
Update systemd service file with new cli flags
 2016-03-14 16:53:05 +01:00
David Keijser
6a8bacf01c Update systemd service file with new cli flags 2016-03-14 16:34:31 +01:00
Emile Vauge
d4cc3900bd Merge pull request #250 from containous/bump-beta-semver 
Bump to beta, using semver
 2016-03-09 23:55:26 +01:00
Emile Vauge
ab619a4a3f
Bump to beta, using semver 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-09 23:40:01 +01:00
Emile Vauge
4c447985b6 Merge pull request #247 from containous/fix-redirect-bug 
fixes redirect bug en port 80
 2016-03-09 19:54:16 +01:00
Emile Vauge
eaadd2d0cd fixes redirect bug en port 80 2016-03-09 18:59:08 +01:00
Emile Vauge
9830086790 Merge pull request #242 from containous/fix-old-docker-repo 
Fix push to old docker repo emilevauge/traefik
 2016-03-08 17:24:26 +01:00
Emile Vauge
8393746e02 Fix benchmarks 2016-03-08 16:27:12 +01:00
Emile Vauge
2314ad9bf9 Fix push to old docker repo emilevauge/traefik 2016-03-08 13:16:58 +01:00
Vincent Demeester
3af21612b6 Merge pull request #239 from goguardian/kv-watch-tree 
Support libkv.WatchTree chan errors:
 2016-03-05 21:58:48 +01:00
Advait Shinde
7674a82801 Fatalf for timeout cases. 2016-03-05 20:43:44 +00:00
Advait Shinde
d63d2a8a26 Support libkv.WatchTree chan errors: 
- libkv.WatchTree returns a channel whose messages represent changes
    to the watched tree. In situations where libkv cannot read from the
    underlying store, libkv will close the provided channel.
  - This PR handles this edge case and fixes #238.
 2016-03-05 20:38:33 +00:00
Vincent Demeester
a458018aa2 Merge pull request #240 from containous/update-benchmarks 
update benchmarks with haproxy and latest results
 2016-03-05 18:39:00 +01:00
Emile Vauge
33cde6aacd
update benchmarks with haproxy and latest results 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-05 13:34:18 +01:00
Vincent Demeester
4ded2682d2 Merge pull request #235 from containous/refactor-hot-reload 
Refactor hot reload
 2016-03-04 16:41:45 +01:00
Emile Vauge
4042938556
add handler switcher instead of Manners 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-04 15:55:28 +01:00
Vincent Demeester
0e683cc535 Merge pull request #234 from thermeon/feature/quick_typo 
Fix typo Unkown -> unknown in error
 2016-03-04 09:01:49 +01:00
Gareth Kirwan
4923da7f4d Fix typo Unkown -> unknown in error 2016-03-03 20:29:52 +00:00
Vincent Demeester
11781087ca Merge pull request #230 from tayzlor/marathon-event-stream 
Use event stream API instead of event subscriptions
 2016-03-02 15:24:43 +01:00
Graham Taylor
3063251d43 Use event stream API instead of event subscriptions 2016-03-02 09:22:14 +00:00
Vincent Demeester
b42b170ad2 Merge pull request #227 from containous/fix-docker-network 
Fix docker network
 2016-03-01 13:12:08 +01:00
Emile Vauge
defbb44b35 Fix docker network 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-01 11:52:30 +00:00
Emile Vauge
a00eb81f03 Merge pull request #228 from ProPheT777/patch-1 
My $0.02 - Center gopher
 2016-02-29 19:35:47 +01:00
Johann Saunier
a63d989a35 My $0.02 - Center gopher 2016-02-29 18:27:09 +01:00
Vincent Demeester
6c3c5578c6 Merge pull request #225 from containous/add-path-prefix 
Add PathPrefixStrip and PathStrip rules
 2016-02-26 16:52:12 +01:00
Emile Vauge
122783e36b
Add PathPrefixStrip and PathStrip rules 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-02-26 15:58:55 +01:00
Emile Vauge
b84b95fe97 Merge pull request #223 from goguardian/kv-multi 
Support multiple endpoints for KV stores:
 2016-02-26 11:41:18 +01:00
Advait Shinde
a99010b8c2 Create an integration test for Etcd: 
- Integration test specifically spins up an Etcd cluster with three
    nodes.
 2016-02-25 23:34:51 +00:00
Advait Shinde
8954aa7118 Update docs to mention commas. 2016-02-25 23:34:51 +00:00
Advait Shinde
3cf848958f Support multiple endpoints for KV stores: 
- Fixes #222
 2016-02-25 23:34:51 +00:00
Vincent Demeester
1a5668377c Merge pull request #209 from tboerger/feature/tls-auth 
Integrated TLS auth for etcd and consul
 2016-02-25 10:58:23 +01:00
Thomas Boerger
dc10c56b35 Integrated TLS auth for etcd and consul 2016-02-24 23:32:34 +01:00
Vincent Demeester
331cd173ce Merge pull request #220 from containous/transfer-repo-to-containous-org 
Transfer emilevauge/traefik to containous/traefik
 2016-02-24 22:22:57 +01:00
Emile Vauge
1881d5eeed
Transfer emilevauge/traefik to containous/traefik 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-02-24 17:38:36 +01:00
Vincent Demeester
e0872b6157 Merge pull request #219 from emilevauge/add-traefik-library-image 
Add publish to traefik-library-image
 2016-02-24 16:11:15 +01:00
Emile Vauge
63fb9c7135
publish binary to traefik-library-image repo 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-02-24 15:48:03 +01:00
Vincent Demeester
9964654495 Merge pull request #183 from keis/consul-catalog 
WIP consul catalog provider
 2016-02-24 09:35:26 +01:00
David Keijser
ae275c9e60 Consul catalog provider 
Fixes #176
 2016-02-24 09:23:27 +01:00
David Keijser
4277fe2fdb Bump libcompose 2016-02-24 09:23:27 +01:00
Vincent Demeester
7acc2beae0 Merge pull request #214 from octoblu/add-frontend-determinism 
Deterministic frontend registration
 2016-02-24 00:05:03 +01:00
Roy van de Water
847deeac79 Deterministic frontend registration 
Conflicts:
	server.go
 2016-02-22 13:37:54 -07:00
Emile Vauge
ac56c1310c Merge pull request #206 from emilevauge/add-partners 
Add partners
 2016-02-22 17:33:28 +01:00
emile
7460b343fe
Cleanup configuration management 2016-02-22 17:15:45 +01:00