vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #289 from resouer/minor-fix

Browse source 
Fix wrong name comment etc
This commit is contained in:
Kenfe-Mickaël Laventure 2016-07-14 09:26:25 -07:00 committed by GitHub
commit 3abb9fc411
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/grpc/types/api.proto
View file

@ -187,7 +187,7 @@ message StateResponse {
message UpdateContainerRequest { message UpdateContainerRequest {
string id = 1; // ID of container string id = 1; // ID of container
string pid = 2; string pid = 2;
string status = 3; // Status to whcih containerd will try to change string status = 3; // Status to which containerd will try to change
UpdateResource resources =4; UpdateResource resources =4;
} }
@ -283,7 +283,7 @@ message BlkioStatsEntry {
} }
message BlkioStats { message BlkioStats {
repeated BlkioStatsEntry io_service_bytes_recursive = 1; // number of bytes tranferred to and from the block device repeated BlkioStatsEntry io_service_bytes_recursive = 1; // number of bytes transferred to and from the block device
repeated BlkioStatsEntry io_serviced_recursive = 2; repeated BlkioStatsEntry io_serviced_recursive = 2;
repeated BlkioStatsEntry io_queued_recursive = 3; repeated BlkioStatsEntry io_queued_recursive = 3;
repeated BlkioStatsEntry io_service_time_recursive = 4; repeated BlkioStatsEntry io_service_time_recursive = 4;

2
ctr/checkpoint.go
View file

@ -79,7 +79,7 @@ var createCheckpointCommand = cli.Command{
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "unix-sockets", Name: "unix-sockets",
Usage: "perist unix sockets", Usage: "persist unix sockets",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "exit", Name: "exit",