1
0
Fork 0

Commit graph

  • a1ab252303
    Fix empty tls flag Emile Vauge 2016-07-05 10:54:58 +02:00
  • 3c89fd51ee Merge pull request #491 from containous/fix-default-weight-in-loadConfig Emile Vauge 2016-07-05 10:56:26 +02:00
  • 018b8a6315
    Fix default weight in server.LoadConfig Emile Vauge 2016-07-04 19:30:32 +02:00
  • ecaa146d5b Merge pull request #492 from containous/fix-webui-proxy Emile Vauge 2016-07-05 10:17:49 +02:00
  • f50a4d8c2a
    Fix webui proxying Emile Vauge 2016-07-05 09:34:17 +02:00
  • 68b0e44fbd Merge pull request #490 from containous/fix-retry-headers Emile Vauge 2016-07-05 09:18:36 +02:00
  • ac9946c697
    Fix retry headers, simplify ResponseRecorder Emile Vauge 2016-07-04 19:32:19 +02:00
  • a0a8bc24e8 Merge pull request #479 from containous/disable-constraints-temporarily Vincent Demeester 2016-06-23 17:46:05 +02:00
  • 06ab802bc6
    Disable constraints in doc until 1.1 Emile Vauge 2016-06-23 17:25:12 +02:00
  • 04ec757083 Merge pull request #477 from containous/fix-spamming-events Vincent Demeester 2016-06-23 17:09:59 +02:00
  • 15e04bb55d
    Fix consul catalog issue with dot in serviceName Emile Vauge 2016-06-22 22:43:20 +02:00
  • e4ed7fd8f7
    Fix bad circuit breaker expression Emile Vauge 2016-06-22 22:14:40 +02:00
  • fd5352b0c6
    Fix empty rule Emile Vauge 2016-06-22 22:07:02 +02:00
  • 606e667b88
    Fix spamming events in listenProviders Emile Vauge 2016-06-22 18:31:14 +02:00
  • 2a209c23c4 Merge pull request #478 from keis/consul-stable-ordering-of-nodes Vincent Demeester 2016-06-23 16:33:22 +02:00
  • 70305266dc Sort nodes before creating consul catalog config David Keijser 2016-06-20 19:13:22 +02:00
  • 8e561d9f95 Merge pull request #441 from NicolasGeraud/patch-1 Vincent Demeester 2016-06-23 10:00:09 +02:00
  • f446cac43c mount acme folder instead of file Nicolas Géraud 2016-06-08 13:07:31 +02:00
  • 7e1ceb9a3e Merge pull request #476 from containous/fix-empty-response Vincent Demeester 2016-06-22 16:39:40 +02:00
  • 1b5e35461d
    Bump oxy to b57d6706e9ff606343c596940b60df7f90012d29 Emile Vauge 2016-06-22 14:57:56 +02:00
  • df75700015 Merge pull request #468 from containous/fix-marathon-tls-auth Vincent Demeester 2016-06-22 14:23:16 +02:00
  • b586df6689
    Fix marathon tests Emile Vauge 2016-06-20 17:11:07 +02:00
  • 4ca2ff0495
    Bump go-marathon a558128c87724cd7430060ef5aedf39f83937f55, add DCOS support Emile Vauge 2016-06-18 14:51:52 +02:00
  • 93494c7e35 Fix errors load config (#470) Emile Vauge 2016-06-20 15:19:52 +02:00
  • 11874bc4ae Fix acme renew, add test (#472) Emile Vauge 2016-06-20 13:55:50 +02:00
  • dcf98d13c8 Fix typo in error message. (#471) Kevin Busse 2016-06-20 12:15:31 +02:00
  • 2a735e815a Merge pull request #469 from kumy/patch-1 Vincent Demeester 2016-06-18 16:24:54 +02:00
  • 52de16b4c9 Merge branch 'master' into patch-1 kumy 2016-06-18 16:06:49 +02:00
  • 7133a28fdb Merge pull request #460 from containous/fix-websocket-hijack Vincent Demeester 2016-06-18 15:50:30 +02:00
  • ade2ff97e0 Typo: Replace French words by English ones kumy 2016-06-18 15:43:35 +02:00
  • 450d86be7d
    Fix websocket connection Hijack Emile Vauge 2016-06-15 19:07:33 +02:00
  • c9caf612eb Merge pull request #464 from containous/fix-memory-leak Vincent Demeester 2016-06-17 00:52:21 +02:00
  • 56ef678c09
    Fix memory leak in listenProviders Emile Vauge 2016-06-16 22:49:57 +02:00
  • 29e647763a Merge pull request #438 from samber/TRAEFIK-311--support-docker-backend Emile Vauge 2016-06-13 00:29:28 +02:00
  • 357150bcab fix(constainrs,docker): Syntax Samuel BERTHE 2016-06-11 19:05:54 +02:00
  • f7224ff403 feat(constraints): Supports constraints for docker backend Samuel BERTHE 2016-06-06 21:59:58 +02:00
  • 01ffad2e6e Merge pull request #450 from containous/fix-default-kv-configuration Vincent Demeester 2016-06-11 15:03:57 +02:00
  • 223e8cafac
    Fix default KV configuration Emile Vauge 2016-06-09 23:44:49 +02:00
  • d1ffbd8a03 Merge pull request #443 from vdemeester/442-and-share-context Emile Vauge 2016-06-09 09:37:48 +02:00
  • f286cb9a34
    Fix panic if listContainers fails… Vincent Demeester 2016-06-08 19:39:38 +02:00
  • 5c63855cc0
    Merge branch 'AlmogBaku-master' Emile Vauge 2016-06-07 20:19:51 +02:00
  • 2a96ae9ec2
    Merge branch 'master' of https://github.com/AlmogBaku/traefik into AlmogBaku-master Emile Vauge 2016-06-07 20:19:21 +02:00
  • 36a2da0659 Merge pull request #440 from containous/emilevauge-add-samber-to-maintainers Samuel BERTHE 2016-06-07 20:15:08 +02:00
  • 38abec520c Add @samber to maintainers Emile Vauge 2016-06-07 19:45:12 +02:00
  • 1274d26b4c Merge branch 'master' into master Almog Baku 2016-06-07 19:45:53 +03:00
  • 6556c79207 Merge pull request #433 from containous/add-routes-priorities Vincent Demeester 2016-06-07 10:10:19 +02:00
  • 7e6c580130
    Add routes priorities in documentation Emile Vauge 2016-06-06 22:40:42 +02:00
  • cc4fb64b34
    Add routes priorities in integration tests Emile Vauge 2016-06-06 22:33:29 +02:00
  • f4cb4bb1b8
    Add routes priorities in providers Emile Vauge 2016-06-06 22:30:23 +02:00
  • 287b3ba1f4
    Add routes priorities test Emile Vauge 2016-06-06 14:54:45 +02:00
  • 208998972a
    Add routes priorities Emile Vauge 2016-06-03 17:58:33 +02:00
  • 7cdd062432 Merge pull request #435 from fclaeys/multiRules Vincent Demeester 2016-06-07 09:12:39 +02:00
  • eccb529605 update docs Fabrice CLAEYS 2016-06-06 16:07:21 +02:00
  • 78dc28cce8 test rules parsing Fabrice CLAEYS 2016-06-06 15:27:16 +02:00
  • 84076db78e allow multiple rules Fabrice CLAEYS 2016-06-06 09:21:00 +02:00
  • c3779f0e94 Merge branch 'master' into master Almog Baku 2016-06-04 18:49:26 +03:00
  • c5ac563e74 Merge pull request #426 from containous/fix-marathon-directory-subdomain Emile Vauge 2016-06-03 11:39:40 +02:00
  • 92ca220890
    Add groupsAsSubDomains option Emile Vauge 2016-06-01 16:47:39 +02:00
  • 72f88e5c0f
    Add marathon directory subdomain Emile Vauge 2016-05-31 23:23:23 +02:00
  • 1a75a71ad6 Merge pull request #428 from containous/fix-default-configuration Vincent Demeester 2016-06-02 17:43:01 +02:00
  • 3c3b179c29
    Deploy PR Docker image Emile Vauge 2016-06-02 15:29:36 +02:00
  • 3f08bb4cdf
    Fix panic on help, Better version Emile Vauge 2016-06-02 15:17:04 +02:00
  • 423268f485
    Fix default configuration Emile Vauge 2016-06-02 11:37:51 +02:00
  • d3f003a15f Merge pull request #415 from download13/docker_network Vincent Demeester 2016-06-02 10:57:32 +02:00
  • 7386378cc0 Merge branch 'master' into docker_network Erin Dachtler 2016-06-01 08:38:23 -07:00
  • d6547462e5 Merge pull request #342 from samber/TRAEFIK-311--adding-constraint-filtering Vincent Demeester 2016-06-01 16:01:00 +02:00
  • d297a220ce fix(constraints): Syntax Samuel BERTHE 2016-06-01 10:29:55 +02:00
  • 1de5434e1a refacto(constraints): Migration to Flaeg cli library Samuel BERTHE 2016-05-31 09:54:42 +02:00
  • f46accc74d test(constraint): unit tests + integration tests + make validate Samuel BERTHE 2016-05-20 17:17:38 +02:00
  • cd2100ed84 doc(constraints): Added in ConsulCatalog backend + new 'Constraint' section Samuel BERTHE 2016-05-20 16:43:56 +02:00
  • ac087921d8 feat(constraints): Implementation of constraint filtering (cmd + toml + matching functions), implementation proposal with consul Samuel BERTHE 2016-05-30 15:05:58 +02:00
  • 82b1f14e2b Merge branch 'master' into docker_network Erin Dachtler 2016-05-31 22:19:45 -07:00
  • df7e1cf078 Squashed commit of the following: Erin Dachtler 2016-05-31 22:11:17 -07:00
  • 39fa8f7be4 Merge pull request #418 from samber/doc--tooling--integration-test-filtering Emile Vauge 2016-05-31 21:40:57 +02:00
  • 46c2184de4 doc(tooling): Doc about selecting some tests with argument '-check.f' of gochecker library Samuel BERTHE 2016-05-30 11:10:51 +02:00
  • a9f9894f29 Merge pull request #422 from containous/fix-travis-tag Emile Vauge 2016-05-31 00:15:58 +02:00
  • a6c360eeda
    Fix travis hangs on docker version Emile Vauge 2016-05-30 23:59:27 +02:00
  • 01a4002169
    Fix travis tag check Emile Vauge 2016-05-30 23:12:26 +02:00
  • 8caaf317ae Merge pull request #412 from containous/prepare-release-candidate Emile Vauge 2016-05-30 18:27:48 +02:00
  • 0e3c2ef10f
    Fix log config file Emile Vauge 2016-05-30 17:57:57 +02:00
  • db6c85d3d7
    Prepare release candidate Emile Vauge 2016-05-27 14:12:29 +02:00
  • 2bd95620a5 Merge pull request #420 from cocap10/fixes-log Vincent Demeester 2016-05-30 17:48:00 +02:00
  • d8ad30f38a log info about TOML configuration file using +glide update flaeg & staert +fix README.md +fix configFile flag description Martin 2016-05-30 11:37:12 +02:00
  • aad5f52968 Merge pull request #416 from download13/no_require_expose Vincent Demeester 2016-05-30 11:21:49 +02:00
  • f5d49f6657 Merge branch 'master' into no_require_expose Erin Dachtler 2016-05-28 16:36:59 -07:00
  • 53ae64e578 Filter containers with no exposed ports unless they have a traefik.port label Erin Dachtler 2016-05-28 15:16:57 -07:00
  • 1a936b6aca Merge pull request #403 from cocap10/migrate-to-staert Vincent Demeester 2016-05-27 16:41:44 +02:00
  • 4776fa1361 add parsers tests Martin 2016-05-27 11:13:34 +02:00
  • c5084fd025 update staert + glide pin version Martin 2016-05-27 10:04:56 +02:00
  • cc2735f733 add Debug StructTag Martin 2016-05-26 15:55:50 +02:00
  • 7f6b2b80f8 rm useless TestNoOrInexistentConfigShouldNotFail Martin 2016-05-26 11:09:20 +02:00
  • f64c2bc065 add flag on ACME Martin 2016-05-25 17:06:34 +02:00
  • 6752b49536 rm useless StrucTag Martin 2016-05-24 17:31:50 +02:00
  • ab138e7df1 update to new version go-bindata-assetfs Martin 2016-05-24 17:29:56 +02:00
  • 059da90a96 clean glide dependancies Martin 2016-05-24 15:45:41 +02:00
  • 0821c7bdd9 Add version in logs Martin 2016-05-24 15:45:20 +02:00
  • 89e00eb5a4 add staert & fleag Martin 2016-05-24 14:59:18 +02:00
  • 1a0f347023 update default value Martin 2016-05-24 14:58:25 +02:00
  • 1e27c2dabe fix TestNoOrInexistentConfigShouldNotFail Martin 2016-05-24 14:23:42 +02:00
  • 629be45c4a fix DisablePassHostHeaders Martin 2016-05-19 17:44:33 +02:00