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

1208 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
e34c364d5e Merge pull request #900 from containous/fix-k8s-panic 
Fix k8s panic
 2016-11-28 12:19:52 +01:00
Emile Vauge
926eb099f1
Fix k8s client panic 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-24 19:19:10 +01:00
Emile Vauge
710508dc40
Fix digest auth doc 2016-11-24 18:17:57 +01:00
Alexander Block
b4ea68b88a Fix missing value for k8s watch request parameter (#874) 
Fixes: 732
 2016-11-23 23:21:09 +01:00
WTFKr0
2bf9acd95e Normalize backend even if is user-defined (#865) 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2016-11-23 21:31:37 +01:00
Kristian Klausen
a8cb905255 consul/kv.tmpl: weight default value should be a int (#826) 
* consul/kv.tmpl: weight default value should be a int

Fix #821

* Use 0 as default weight in all backends
 2016-11-23 14:49:55 +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
Emile Vauge
fe1b982d13 Merge pull request #856 from containous/prepare-release-v1.1.0 
Changelog v1.1.0
 2016-11-17 22:41:11 +01:00
Emile Vauge
221ae2427b
changelog v1.1.0 2016-11-17 22:07:15 +01:00
Emile Vauge
29f780863b Merge pull request #845 from containous/fix-kubernetes-watch-leak 
Fix Kubernetes watch leak
 2016-11-17 18:54:12 +01:00
Emile Vauge
8aaca8e55c
Update docs with errm talk 2016-11-17 17:37:06 +01:00
Emile Vauge
2dda3d2feb
Fix Kubernetes watch leak 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-17 17:37:06 +01:00
Emile Vauge
22ebaedb45 Merge pull request #855 from containous/fix-path-case-sensitive-v1.1 
Fix path case sensitive v1.1
 2016-11-17 17:36:40 +01:00
Steven Bower
7065f00443
Fixes #851 (#852) 2016-11-17 15:40:25 +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
Emile Vauge
801e0f9ef7 Merge pull request #849 from containous/fix-golint-1.1 
Fix golint in v1.1
 2016-11-16 12:26:56 +01:00
Ed Robinson
874ea62dd5
Adds misspell to validate target 2016-11-16 11:04:26 +00:00
Ed Robinson
ac20ddfc6c
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 11:52:15 +01: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
Vincent Demeester
f6576cce27 Merge pull request #842 from guilhem/version-cross-binary 
Pass Version, Codename and Date to crosscompiled
 2016-11-14 17:35:58 +01:00
Bruce Lee
e068ee09ca Allow specification of dialertimeout 
Address documentation comments
 2016-11-14 10:57:46 -05:00
Guilhem Lettron
d3b48cdd22 Pass Version, Codename and Date to crosscompiled 
Copy variables from ./script/binary
 2016-11-14 16:41:30 +01: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
Emile Vauge
c26b36cf4f Merge pull request #820 from trecloux/check_http2 
Check that we serve HTTP/2
 2016-11-14 09:38:31 +01:00
Thomas Recloux
3095da64d7 Check that we provide HTTP/2 2016-11-14 09:10:47 +01:00
Vincent Demeester
07f961ecba Merge pull request #829 from SantoDE/fix-webui-dashboard 
Add Nvd3 Dependency to fix UI / Dashboard
 2016-11-13 11:47:22 +01: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