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
a2d8b0af
Commit
a2d8b0af
authored
May 06, 2016
by
Robert Bailey
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #25027 from xiangpengzhao/fix_funcname
Rename a func in manager.go
parents
dcd6df15
d27127aa
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
manager.go
pkg/kubelet/dockertools/manager.go
+2
-2
No files found.
pkg/kubelet/dockertools/manager.go
View file @
a2d8b0af
...
@@ -545,7 +545,7 @@ func (dm *DockerManager) runContainer(
...
@@ -545,7 +545,7 @@ func (dm *DockerManager) runContainer(
ContainerName
:
container
.
Name
,
ContainerName
:
container
.
Name
,
}
}
securityOpts
,
err
:=
dm
.
d
efaultSecurityOpt
()
securityOpts
,
err
:=
dm
.
getD
efaultSecurityOpt
()
if
err
!=
nil
{
if
err
!=
nil
{
return
kubecontainer
.
ContainerID
{},
err
return
kubecontainer
.
ContainerID
{},
err
}
}
...
@@ -949,7 +949,7 @@ func (dm *DockerManager) checkVersionCompatibility() error {
...
@@ -949,7 +949,7 @@ func (dm *DockerManager) checkVersionCompatibility() error {
return
nil
return
nil
}
}
func
(
dm
*
DockerManager
)
d
efaultSecurityOpt
()
([]
string
,
error
)
{
func
(
dm
*
DockerManager
)
getD
efaultSecurityOpt
()
([]
string
,
error
)
{
version
,
err
:=
dm
.
APIVersion
()
version
,
err
:=
dm
.
APIVersion
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
...
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