github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18575 from jay-lau/master 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-12-11 17:11:40 -08:00
parent a1f6cc3f63 69439149ed
commit 5ff88a4eb6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/mesos/pkg/scheduler/config/config.go
View File

@ -56,8 +56,8 @@ type Config struct {
UpdatesBacklog int `gcfg:"updates-backlog"` UpdatesBacklog int `gcfg:"updates-backlog"`
FrameworkIdRefreshInterval WrappedDuration `gcfg:"framework-id-refresh-interval"` FrameworkIdRefreshInterval WrappedDuration `gcfg:"framework-id-refresh-interval"`
InitialImplicitReconciliationDelay WrappedDuration `gcfg:"initial-implicit-reconciliation-delay"` InitialImplicitReconciliationDelay WrappedDuration `gcfg:"initial-implicit-reconciliation-delay"`
ExplicitReconciliationMaxBackoff WrappedDuration `gcfg:"explicit-reconciliantion-max-backoff"` ExplicitReconciliationMaxBackoff WrappedDuration `gcfg:"explicit-reconciliation-max-backoff"`
ExplicitReconciliationAbortTimeout WrappedDuration `gcfg:"explicit-reconciliantion-abort-timeout"` ExplicitReconciliationAbortTimeout WrappedDuration `gcfg:"explicit-reconciliation-abort-timeout"`
InitialPodBackoff WrappedDuration `gcfg:"initial-pod-backoff"` InitialPodBackoff WrappedDuration `gcfg:"initial-pod-backoff"`
MaxPodBackoff WrappedDuration `gcfg:"max-pod-backoff"` MaxPodBackoff WrappedDuration `gcfg:"max-pod-backoff"`
HttpHandlerTimeout WrappedDuration `gcfg:"http-handler-timeout"` HttpHandlerTimeout WrappedDuration `gcfg:"http-handler-timeout"`

4
contrib/mesos/pkg/scheduler/config/config_test.go
View File

@ -67,8 +67,8 @@ func TestConfig_Read(t *testing.T) {
updates-backlog=42 updates-backlog=42
framework-id-refresh-interval=42s framework-id-refresh-interval=42s
initial-implicit-reconciliation-delay=42s initial-implicit-reconciliation-delay=42s
explicit-reconciliantion-max-backoff=42s explicit-reconciliation-max-backoff=42s
explicit-reconciliantion-abort-timeout=42s explicit-reconciliation-abort-timeout=42s
initial-pod-backoff=42s initial-pod-backoff=42s
max-pod-backoff=42s max-pod-backoff=42s
http-handler-timeout=42s http-handler-timeout=42s