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

3644 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
emile
ec16011e31
Add partners, move contributing 2016-02-22 16:26:20 +01:00
emile
71b0e27517
bash instead? 2016-02-22 16:03:57 +01:00
emile
60e9282f0a
fixes typo ghr 2016-02-22 15:35:51 +01:00
emile
6cd35a50ce
after succes make deploy 2016-02-22 15:17:14 +01:00
emile
b35ad76ec6
rewrite deploy tests 2016-02-22 15:01:00 +01:00
emile
54208f6fc3
travis after_success instead of deploy 
Signed-off-by: emile <emile@vauge.com>
 2016-02-22 14:33:46 +01:00
emile
6282bf33a0
travis skip_cleanup 
Signed-off-by: emile <emile@vauge.com>
 2016-02-22 14:11:17 +01:00
Emile Vauge
a1c1958235 Merge pull request #208 from emilevauge/migrate-on-travisci 
Migrate on travisci
 2016-02-22 13:35:00 +01:00
emile
91b699fbe0
Migrate CI to travis 
- Add travis build file
- Use golang alpine image
- Clean scripts a little bit
- Disable CGO for test-integration >_<
 2016-02-22 12:20:56 +01:00
Vincent Demeester
3a08655b06 Merge pull request #188 from emilevauge/add-marathon-tls-client-config 
Add Marathon TLS client config
 2016-02-18 14:23:38 +01:00
emile
9a9c8e5709 Add Marathon TLS client config 
Signed-off-by: emile <emile@vauge.com>
 2016-02-18 12:42:59 +00:00