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
73a3d48d
Commit
73a3d48d
authored
Jul 19, 2016
by
k8s-merge-robot
Committed by
GitHub
Jul 19, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #29196 from lixiaobing10051267/masterDiskName
Automatic merge from submit-queue glog.Warning output content not complete, lack of string fomat "%s"
parents
9a7507c4
1a013083
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
aws.go
pkg/cloudprovider/providers/aws/aws.go
+1
-1
No files found.
pkg/cloudprovider/providers/aws/aws.go
View file @
73a3d48d
...
@@ -1413,7 +1413,7 @@ func (c *Cloud) DetachDisk(diskName string, instanceName string) (string, error)
...
@@ -1413,7 +1413,7 @@ func (c *Cloud) DetachDisk(diskName string, instanceName string) (string, error)
}
}
if
!
alreadyAttached
{
if
!
alreadyAttached
{
glog
.
Warning
(
"DetachDisk called on non-attached disk: "
,
diskName
)
glog
.
Warning
(
"DetachDisk called on non-attached disk:
%s
"
,
diskName
)
// TODO: Continue? Tolerate non-attached error in DetachVolume?
// TODO: Continue? Tolerate non-attached error in DetachVolume?
}
}
...
...
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