Small fixes #1291
Merged
Small fixes #1291
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timoreimann
reviewed
Mar 14, 2017
configuration.go
Outdated
| @@ -392,6 +392,9 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { | |||
| defaultMesos.Endpoint = "http://127.0.0.1:5050" | |||
| defaultMesos.ExposedByDefault = true | |||
| defaultMesos.Constraints = types.Constraints{} | |||
| defaultMesos.RefreshSeconds = 10 | |||
| defaultMesos.ZkDetectionTimeout = 30 | |||
| defaultMesos.StateTimeoutSecond = 30 | |||
There was a problem hiding this comment.
Do we need to document the defaults somewhere?
There was a problem hiding this comment.
Well done, added in traefik.sample.toml and doc/toml.md. Fixed a typo in the doc BTW ;)
emilevauge
force-pushed
the
small-fixes
branch
3 times, most recently
from
f2a8007
to
4ea0eb0
Compare
vdemeester
approved these changes
Mar 15, 2017
provider/kubernetes.go
Outdated
| @@ -30,12 +30,8 @@ type Kubernetes struct { | |||
| } | |||
|
|
|||
| func (provider *Kubernetes) newK8sClient() (k8s.Client, error) { | |||
There was a problem hiding this comment.
nit: This method doesn't have a reason to live anymore I think 😛
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
emilevauge
added
status/3-needs-merge
and removed
status/1-needs-design-review
status/2-needs-review
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1248
Small refactor of k8s client config which now support external cluster client.