Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c4aa7ee0
Commit
c4aa7ee0
authored
Jun 24, 2016
by
k8s-merge-robot
Committed by
GitHub
Jun 24, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #25024 from xiangpengzhao/fix_typos
Automatic merge from submit-queue Fix typos in docker.go Fix minor typos in variable name
parents
8c957788
33039c28
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
docker.go
pkg/kubelet/dockertools/docker.go
+4
-4
No files found.
pkg/kubelet/dockertools/docker.go
View file @
c4aa7ee0
...
@@ -53,8 +53,8 @@ const (
...
@@ -53,8 +53,8 @@ const (
milliCPUToCPU
=
1000
milliCPUToCPU
=
1000
// 100000 is equivalent to 100ms
// 100000 is equivalent to 100ms
quotaPeriod
=
100000
quotaPeriod
=
100000
minQuotaPerod
=
1000
minQuotaPer
i
od
=
1000
)
)
// DockerInterface is an abstract interface for testability. It abstracts the interface of docker client.
// DockerInterface is an abstract interface for testability. It abstracts the interface of docker client.
...
@@ -348,8 +348,8 @@ func milliCPUToQuota(milliCPU int64) (quota int64, period int64) {
...
@@ -348,8 +348,8 @@ func milliCPUToQuota(milliCPU int64) (quota int64, period int64) {
quota
=
(
milliCPU
*
quotaPeriod
)
/
milliCPUToCPU
quota
=
(
milliCPU
*
quotaPeriod
)
/
milliCPUToCPU
// quota needs to be a minimum of 1ms.
// quota needs to be a minimum of 1ms.
if
quota
<
minQuotaPerod
{
if
quota
<
minQuotaPer
i
od
{
quota
=
minQuotaPerod
quota
=
minQuotaPer
i
od
}
}
return
return
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment