1
0
Fork 0

Commit graph

  • 3112432480 Merge remote-tracking branch 'upstream/v1.3' into HEAD Timo Reimann 2017-05-11 21:10:20 +02:00
  • aa4ed088bb
    Unexport Kvclient & StoreType from kv Provider Emile Vauge 2017-05-11 19:09:06 +02:00
  • 3a4ec19817
    Add missing description tag Emile Vauge 2017-05-11 19:07:45 +02:00
  • d2b204a075 Merge pull request #1581 from timoreimann/1-3-kubernetes-ignore-missing-pass-host-header-annotation Timo Reimann 2017-05-11 17:43:14 +02:00
  • 94f5b0d9ff Merge pull request #1571 from containous/restore-access-logger Ludovic Fernandez 2017-05-11 17:24:26 +02:00
  • d2c8824902 refactor: restore "First stage of access logging middleware." Fernandez Ludovic 2017-05-09 14:02:44 +02:00
  • fe6c35bc6b [Kubernetes] Ignore missing pass host header annotation. Timo Reimann 2017-05-04 11:34:05 +02:00
  • db09007dbc Merge pull request #1558 from Stibbons/yarnpkg Ludovic Fernandez 2017-05-10 18:26:05 +02:00
  • 5b2e8990f1 prefere yarnpkg over yarn Gaetan Semet 2017-05-05 18:13:30 +02:00
  • 2f6068decc Merge pull request #1580 from atbore-phx/docker-light Ludovic Fernandez 2017-05-10 17:23:37 +02:00
  • 1e591dd188 clean up apt-cache in webui/Dockerfile Attilio Borello 2017-05-10 09:33:41 +02:00
  • 6838a81e50 replaced docker images with alpine if available (nginx, rabbitmq) Attilio Borello 2017-05-10 08:54:38 +02:00
  • ceef5e39b7 Merge pull request #1572 from atbore-phx/ci-docker-version Ludovic Fernandez 2017-05-09 16:04:08 +02:00
  • ef339af623 added DOCKER_VERSION variable Attilio Borello 2017-05-09 10:34:30 +02:00
  • acc7865542 Merge pull request #1554 from ldez/feat-push-force-pr Ludovic Fernandez 2017-05-05 17:19:30 +02:00
  • c00c240c14 feat(github): push force contributor branch. Fernandez Ludovic 2017-05-04 20:34:59 +02:00
  • 3fd6da06e0 Merge pull request #1556 from atbore-phx/hf-travis Ludovic Fernandez 2017-05-05 15:19:55 +02:00
  • 95502aeec3 hot fix for release, travis runs before_deploy for each provider! we add a condition to run once Attilio Borello 2017-05-05 14:17:08 +02:00
  • 58c786ca8c Merge pull request #1552 from atbore-phx/new-ci Ludovic Fernandez 2017-05-05 09:33:43 +02:00
  • b6916d2f8c added initial ci conf Attilio Borello 2017-05-04 15:23:04 +02:00
  • 840c131a98 Merge pull request #1546 from atbore-phx/rf-travis-ci Ludovic Fernandez 2017-05-04 21:28:10 +02:00
  • 219bcec40f crossbinary default is now executed before deploy using multiple make jobs in parallel Attilio Borello 2017-05-04 09:31:39 +02:00
  • ccda550ab1 Merge pull request #1553 from containous/prepare-release-v1.3.0-rc1 Ludovic Fernandez 2017-05-04 20:15:20 +02:00
  • b5e73cfa07
    Prepare release v1.3.0-rc1 Emile Vauge 2017-05-04 18:17:13 +02:00
  • ba928dd459 Merge pull request #1241 from vholovko/healthcheck_changes Emile Vauge 2017-05-04 17:25:12 +02:00
  • 6fd40dbaa9
    Using more sensible consul blocking query to detect health check changes Volodymyr Holovko 2017-03-07 01:46:37 +02:00
  • 6ad273b9fa Merge pull request #1542 from maxwo/working-ui Ludovic Fernandez 2017-05-04 02:38:45 +02:00
  • 5500658f5a feat(UI) : Working UI. Maxime Wojtczak 2017-05-03 17:28:56 +02:00
  • b4f9e3890f Merge pull request #1535 from atbore-phx/crossbinary-parallel Ludovic Fernandez 2017-05-04 00:47:38 +02:00
  • df6741aeeb Makefile target to enable parallel jobs Attilio Borello 2017-05-03 06:00:05 +02:00
  • 5535318cda Merge pull request #1538 from containous/merge-v1.2.3-master Ludovic Fernandez 2017-05-03 23:49:47 +02:00
  • 4e186cecf9
    Merge v1.2.3 master Emile Vauge 2017-05-03 23:24:53 +02:00
  • 8ac281f9e3
    Prepare release v1.2.3 Emile Vauge 2017-04-13 20:06:25 +02:00
  • e7a73d3fb3
    Fix too many redirect Emile Vauge 2017-04-13 16:37:07 +02:00
  • ca9e36ebe3
    Prepare release v1.2.2 Emile Vauge 2017-04-11 20:13:18 +02:00
  • 138fea17ed
    Fix redirect empty backend Adam Geiger 2017-03-10 13:43:20 -05:00
  • bf3f6e2029
    Fix Docker filter empty rule Emile Vauge 2017-04-07 16:30:57 +02:00
  • ec245d604a
    Fix postLoadConfig Emile Vauge 2017-04-07 15:48:58 +02:00
  • 69e081f40f Merge pull request #1541 from containous/revert-73a1b17 Emile Vauge 2017-05-03 19:35:50 +02:00
  • 82651985c4
    Revert "First stage of access logging middleware. Initially without any output appenders." Emile Vauge 2017-05-03 17:08:16 +02:00
  • a5384bae47 Merge pull request #1540 from containous/marathon-add-tests-lost-during-1320-rebase Ludovic Fernandez 2017-05-03 17:15:10 +02:00
  • 1dcf8d2ea6 Add tests lost during PR 1320. Timo Reimann 2017-05-03 16:03:54 +02:00
  • e86df016c3 Merge pull request #1537 from ldez/refactor-git-alias-safe Ludovic Fernandez 2017-05-03 16:24:38 +02:00
  • 72baf746f4 refactor: fix for PR with master branch. Fernandez Ludovic 2017-05-03 14:27:51 +02:00
  • 91b4b47f04 Merge pull request #1523 from tanyadegurechaff/make-port-deterministic Ludovic Fernandez 2017-05-03 15:53:46 +02:00
  • 79cbe56a41 Make port deterministic tanyadegurechaff 2017-04-28 17:05:54 +09:00
  • f621d7a2c4 Merge pull request #1525 from guilhem/fix-watchdog Ludovic Fernandez 2017-05-03 15:25:15 +02:00
  • 3c33eab35e Fix systemd watchdog feature Guilhem Lettron 2017-05-02 13:29:56 +02:00
  • b67a27d0c7 Merge pull request #1527 from yyekhlef/master Ludovic Fernandez 2017-05-03 14:32:01 +02:00
  • 8de107866f feat(rancher): added constraint management for rancher provider Youcef Yekhlef 2017-05-02 16:51:02 +02:00
  • b5283391dd Merge pull request #1488 from alpe/k8s-auth Ludovic Fernandez 2017-05-03 13:37:05 +02:00
  • 420a6db3b4 doc: add k8s basic auth. Fernandez Ludovic 2017-05-02 15:08:18 +02:00
  • 89da3b15a4 Add basic auth to kubernetes provider Alex Peters 2017-04-23 16:17:20 +02:00
  • dcc4d92983 Merge pull request #1524 from jangie/update-dep-go-marathon Emile Vauge 2017-05-03 13:06:36 +02:00
  • 12c2d398a7 retry using 'script/glide.sh update' Bruce Lee 2017-05-02 10:35:43 -04:00
  • 4e238280bc [Marathon] Bump go-marathon dep jangie 2017-05-02 02:17:27 +00:00
  • bd6056c269 Merge pull request #1534 from containous/revert-1464-vendor-autogen Ludovic Fernandez 2017-05-03 10:40:38 +02:00
  • acb0492e26 Merge pull request #1464 from vdemeester/vendor-autogen Fernandez Ludovic 2017-05-03 10:02:14 +02:00
  • a0d6594e99 Merge pull request #1464 from vdemeester/vendor-autogen Emile Vauge 2017-05-01 19:07:15 +02:00
  • 65f81990a7
    Update script to use /usr/bin/env bash… Vincent Demeester 2017-04-21 11:23:45 +02:00
  • 1b85dd0455
    Vendor generated file Vincent Demeester 2017-04-21 11:21:55 +02:00
  • bec45bc7d6 Merge pull request #1516 from ldez/refactor/documentation-review Emile Vauge 2017-05-01 18:32:20 +02:00
  • 4c4b05d024 refactor: small documentation review Fernandez Ludovic 2017-04-30 20:17:57 +02:00
  • 228ad9a244 Merge pull request #1517 from gottwald/safe-tests Ludovic Fernandez 2017-05-01 17:33:16 +02:00
  • 2f06f339ec
    Add unit tests for package safe Ingo Gottwald 2017-04-30 14:39:49 +02:00
  • eefcf026d2 Merge pull request #1515 from ldez/github-template-again Emile Vauge 2017-05-01 16:08:14 +02:00
  • ccb1a4ff8c
    doc: enhance Github templates. Fernandez Ludovic 2017-04-30 12:53:42 +02:00
  • 78f1b4216e Merge pull request #1343 from uqf/improve-rancher-provider Emile Vauge 2017-05-01 12:34:59 +02:00
  • 44db6e9290 mprove Rancher provider functionality: - Improves default filtering behavior to filter by container health/healthState - Optionally allows filtering by service health/healthState - Allows configuration of refresh interval Matthew Kelch 2017-04-29 15:37:54 -04:00
  • e2fdc27d64 Merge pull request #1338 from containous/add-global-option-for-healthcheck-interval Timo Reimann 2017-04-28 21:35:29 +02:00
  • 25345427c3 Add global health check interval parameter. Timo Reimann 2017-03-24 09:36:33 +01:00
  • ce492895e2 Merge pull request #1320 from containous/configure-healthcheck-via-marathon-label Timo Reimann 2017-04-28 18:59:35 +02:00
  • 5d43b9e16a Add HealthCheckSuite to list of integration tests. Timo Reimann 2017-04-26 01:08:32 +02:00
  • 71a2c8bdcd Fix health check integration test suite typo. Timo Reimann 2017-04-26 01:08:15 +02:00
  • 8fd6160758 Fix health check path key name in Marathon template. Timo Reimann 2017-04-26 01:07:59 +02:00
  • d57f83c31c Make Traefik health checks label-configurable with Marathon. Timo Reimann 2017-03-15 19:16:06 +01:00
  • 441d5442a1 Merge pull request #1339 from seguins/928-fix-regex-pathstrip Ludovic Fernandez 2017-04-28 18:01:05 +02:00
  • bf3673879f Fix regex with PathStrip Stéphane Seguin 2017-03-24 12:07:59 +01:00
  • 74925ba996 Merge pull request #1357 from tcolgate/libkvuname Ludovic Fernandez 2017-04-28 16:51:41 +02:00
  • de6d771bc2 Add libkv Username and Password Tristan Colgate 2017-03-28 16:54:48 +01:00
  • 2f1a7cbf26 Merge pull request #1436 from Regner/1307-fix-k8s-tests-missing-endpoints Ludovic Fernandez 2017-04-28 15:54:33 +02:00
  • d24ba90900 Updating Kubernetes tests to properly test missing endpoints code path Regner Blok-Andersen 2017-04-13 15:00:25 -07:00
  • 9ed55e9eae Merge pull request #1337 from SantoDE/fix/rancher_docs Ludovic Fernandez 2017-04-28 10:40:29 +02:00
  • a0c3d6a421 make docs more clear about how to work with the current api Manuel Laufenberg 2017-03-24 10:13:12 +01:00
  • 521e295349 Merge pull request #1374 from ssttevee/path-replace-rule Ludovic Fernandez 2017-04-27 10:38:41 +02:00
  • aa8375e82b added path replacement rule ssttevee 2017-04-25 11:13:39 -07:00
  • 5a8215a1e4 Merge pull request #1345 from diegooliveira/IP-Per-Task-Fix-Hostname Timo Reimann 2017-04-26 12:14:01 +02:00
  • 7eb3051a57 Improve and extend TestGetBackendServer. Timo Reimann 2017-04-22 22:51:22 +02:00
  • a4355569af Extract index functionality into generic helper function. Timo Reimann 2017-04-22 22:07:27 +02:00
  • 16c86022bb Cosmetic changes. Timo Reimann 2017-04-21 16:06:14 +02:00
  • e615e833bc Use go-spew to display diffs. Timo Reimann 2017-04-21 16:06:05 +02:00
  • 592a12dca2 Fix unsound behavior Diego de Oliveira 2017-03-26 16:59:08 -03:00
  • 97a3564945 Merge pull request #1497 from containous/re-exclude-dist-traefik-in-dockerignore Timo Reimann 2017-04-26 10:34:20 +02:00
  • f1ee471b6b Re-exclude /dist/traefik from .dockerignore. Timo Reimann 2017-04-25 22:55:54 +02:00
  • 750fa22cff Merge pull request #1474 from containous/marathon-check-port-label-overwrite-earlier Timo Reimann 2017-04-26 03:21:33 +02:00
  • 099d605aed Check for explicitly defined Marathon port first. Timo Reimann 2017-04-20 22:05:21 +02:00
  • f1bc80ca12 Change getLabel signature to return bool instead of error. Timo Reimann 2017-04-20 22:06:27 +02:00
  • 49a9aeb95f Merge pull request #1489 from containous/docker-move-test-providers-into-run-body Timo Reimann 2017-04-25 15:30:37 +02:00
  • 25abf8b8f8 Stop retrying unit tests on Travis. Timo Reimann 2017-04-24 22:15:28 +02:00
  • 962fb908c0 Pass through TESTDIRS env var to Docker build container. Timo Reimann 2017-04-24 18:11:34 +02:00