Skip to content

Commit

Permalink
Merge pull request #13132 from mfojtik/upstream-reconciler-period-15
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Mar 1, 2017
2 parents 3687be3 + a86e3f6 commit 9cdd550
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/cmd/server/kubernetes/master_config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func TestCMServerDefaults(t *testing.T) {
ClusterSigningKeyFile: "/etc/kubernetes/ca/ca.key",
EnableGarbageCollector: true,
DisableAttachDetachReconcilerSync: false,
ReconcilerSyncLoopPeriod: unversioned.Duration{Duration: 5 * time.Second},
ReconcilerSyncLoopPeriod: unversioned.Duration{Duration: 60 * time.Second},
},
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9cdd550

Please sign in to comment.