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

964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yves Peter
9236a43a4d kubernetes: moved doc of client to the interface 2016-11-30 19:25:22 +01:00
yvespp
7f4eddf6d6 k8s: changed debug log, removed unneeded stop channels, increased watch channel buffer 2016-11-30 19:16:48 +01:00
Ed Robinson
d1e631a487 Flatten dependencies 
Deps for the integration suite are handled seperately, and not
flattend, as glide can't read the version info from docker/docker
 2016-11-30 19:16:48 +01:00
Yves Peter
0b78375211 Kubernetes client: set resync period to 5 minutes for more robustness 2016-11-30 19:16:48 +01:00
Yves Peter
15540764a0 Switched Kubernetes provider to new client implementation: https://github.com/kubernetes/client-go 2016-11-30 19:16:48 +01:00
Vincent Demeester
82234cbbb2 Merge pull request #862 from Juliens/eureka 
test-integration(eureka): Add some integration tests
 2016-11-29 23:00:50 +01:00
Emile Vauge
22392daef7 Merge branch 'master' into eureka 2016-11-29 19:04:43 +01:00
Lewis Headden
567387aee0 Enable TCP Keep Alive for Marathon Client and make value configurable (#784) 
* Resolve rebase conflicts

* Fix imports that VSCode messed up
 2016-11-22 16:11:28 +01:00
Julien Salleyron
5b71e3184a fix: lint 2016-11-20 18:34:42 +01:00
Julien Salleyron
e1724444ac test(integration-test): Integration test for eureka 2016-11-20 18:25:48 +01:00
Julien Salleyron
cf8940e80e fix(eureka): Wrong host in rule 2016-11-20 18:25:48 +01:00
Steven Bower
15732269da Fixes #851 (#852) 2016-11-17 15:36:10 +01:00
Emile Vauge
7b06be8f5e Merge pull request #636 from Juliens/eureka 
Add Eureka provider
 2016-11-17 09:32:27 +01:00
Julien Salleyron
d2dcec40e1 test(integration-test): First test for eureka 2016-11-16 23:21:47 +01:00
Julien Salleyron
2af6cc4d1b feat(provider): Add Eureka Provider 2016-11-16 22:00:24 +01:00
Ed Robinson
56c6174d61 Merge pull request #622 from errm/use-stdlib-context 
Context is part of the stdlib in go 1.7
 2016-11-16 14:26:38 +00:00
Ed Robinson
66e914a8ab
Adds Cleanup method to safe.Pool 2016-11-16 14:03:23 +00:00
Ed Robinson
8ae9607d9b
Update dev documentation to require go 1.7 2016-11-16 14:03:23 +00:00
Ed Robinson
5c0297fb61
Context is part of the stdlib on 1.7 2016-11-16 14:03:23 +00:00
Vincent Demeester
f5bf9a2cda Merge pull request #846 from errm/yarn 
Use the yarn package manager for javascript
 2016-11-16 13:29:21 +01:00
Ed Robinson
987ab7612d
Use the yarn pacakge manager for javascript 
[Yarn](https://yarnpkg.com/) is a drop in replacement for npm.

We should use it because:

* It's faster
* It uses a lockfile, making the builds more deterministic.
 2016-11-16 12:02:30 +00:00
Vincent Demeester
a186d5f87a Merge pull request #847 from errm/typo 
Fixes a spelling error
 2016-11-16 12:37:34 +01:00
Ed Robinson
874ea62dd5
Adds misspell to validate target 2016-11-16 11:04:26 +00:00
Ed Robinson
f0b991e1a8
Validate misspellings in documentation 2016-11-16 09:50:20 +00:00
Ed Robinson
adf385fdf3
Fix docs misspelling 2016-11-16 09:42:10 +00:00
Ed Robinson
7af6bc093d
Adds misspell validation 2016-11-16 09:29:36 +00:00
Ed Robinson
3708fa864b
Fixes a spelling error 2016-11-16 09:28:16 +00:00
Emile Vauge
28276e1b37 Merge pull request #848 from errm/golint 
Fix golint
 2016-11-16 10:23:02 +01:00
Ed Robinson
b0efd685a9
Fix golint 
recent additions to golint mean that a number of files cause the
build to start failing if they are edited (we only run against changed
files)

This fixes all the errors in the repo so things don't unexpectedly start
failing for people making PRs
 2016-11-16 08:56:52 +00:00
Ed Robinson
422aacf8e6 Merge pull request #716 from jangie/allow-connection-timeout-configuration 
Allow specification of dialertimeout
 2016-11-15 21:38:53 +00:00
Bruce Lee
e068ee09ca Allow specification of dialertimeout 
Address documentation comments
 2016-11-14 10:57:46 -05:00
Manuel Laufenberg
91e3bdff48 Merge pull request #827 from errm/remove-versions-from-examples 
Remove version numbers from examples
 2016-11-14 11:45:27 +01:00
Ed Robinson
4299d1526b
Remove version numbers from examples 
Fixes #808
 2016-11-14 09:13:09 +00:00
Manuel Laufenberg
8d9caaec71 Merge pull request #789 from wallies/master 
Add marathon tls options to documentation
 2016-11-13 11:35:00 +01:00
Cam Parry
91634d5c1c
Add marathon tls options to documentation 2016-11-13 19:11:36 +10:00
Vincent Demeester
f5463c3d38 Merge pull request #788 from TerraTech/fix_makefile 
Makefile: Strip 'heads/' from git rev-parse --abbrev-ref HEAD
 2016-11-12 13:29:47 +01:00
TerraTech
73b70393d4 Makefile: Strip 'heads/' from git rev-parse --abbrev-ref HEAD 
git rev-parse --abbrev-ref HEAD can return results in a couple different ways:
  1) tag v1.1.0-rc3 exists and branch==v1.1.0-rc3
     result: heads/v1.1.0-rc3
  2) tag v1.1.0-rc3 doesn't exist and branch==v1.1.0-rc3
     result: v1.1.0-rc3

  Strip it off GIT_BRANCH regardless as it will break the build.  e.g.

  $ make binary
  docker build  -t "traefik-dev:heads/v1.1.0-rc3" -f build.Dockerfile .
  invalid value "traefik-dev:heads/v1.1.0-rc3" for flag -t: Error parsing reference: "traefik-dev:heads/v1.1.0-rc3" is not a valid repository/tag
  See 'docker build --help'.
  Makefile:51: recipe for target 'build' failed
  make: *** [build] Error 125
 2016-11-11 16:22:51 -05:00
Manuel Laufenberg
d174ed75c7 Merge pull request #787 from SirCAS/contribute-guide 
Added note for how to avoid running vendor tests
 2016-11-10 19:34:28 +01:00
Christoffer Illum Søndergaard
513d261f10 Added note for how to avoid running vendor tests 2016-11-10 19:05:52 +01:00
Emile Vauge
acf425b6cf Merge pull request #817 from gomes/master 
Marathon ExposedByDefault is true by default
 2016-11-10 11:34:00 +01:00
Diogo Gomes
98b35affd5 Merge branch 'master' into master 2016-11-09 22:04:56 -02:00
Manuel Laufenberg
b3cc1e1af1 Merge pull request #806 from djalal/patch-2 
fix typos
 2016-11-09 23:09:29 +01:00
Diogo Gomes
2b770ae2f8 Actually the current Marathon default for exposedByDefault is true, as 
…
we can see in
https://github.com/containous/traefik/blob/master/configuration.go
“defaultMarathon.ExposedByDefault = true”
 2016-11-08 11:20:50 -02:00
djalal
952fcf5d09 fix typos 2016-11-05 23:02:43 +01:00
Vincent Demeester
931a124349 Merge pull request #786 from guybrush/doc-basics-frontends 
Fix typo in docs
 2016-11-02 07:39:20 +01:00
Patrick Pfeiffer
ab52f4d91d Fix typo in docs 2016-10-30 13:21:43 +01:00
Vincent Demeester
f3182ef29b Merge pull request #761 from nathan-osman/errors-in-health 
Errors in health
 2016-10-28 17:52:52 +02:00
Nathan Osman
05f6b79e29
Add optional statistics to API and web UI. 
A new option (--web.statistics) enables the collection of some basic
information about requests and responses. This currently consists of
the most recent 10 requests that resulted in HTTP 4xx or 5xx errors.
 2016-10-25 15:36:23 -07:00
Emile Vauge
14db2343c9 Merge pull request #773 from containous/merge-v1.1.0-rc2 
Merge v1.1.0 rc2
 2016-10-25 09:04:07 +02:00
Emile Vauge
67eb0c8de0
Merge tag 'v1.1.0-rc2' into master 2016-10-24 21:38:42 +02:00