Skip to content

Commit 447c519

Browse files
committed
make changes per PR
Signed-off-by: plaurent <[email protected]>
1 parent 2248c1e commit 447c519

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

api/api.pb.txt

-15
Original file line numberDiff line numberDiff line change
@@ -11698,21 +11698,6 @@ file {
1169811698
weak_dependency: 2
1169911699
syntax: "proto3"
1170011700
}
11701-
file {
11702-
name: "github.com/docker/swarmkit/api/test.proto"
11703-
package: "docker.swarmkit.v1"
11704-
message_type {
11705-
name: "TestService"
11706-
field {
11707-
name: "TestService"
11708-
number: 1
11709-
label: LABEL_OPTIONAL
11710-
type: TYPE_UINT64
11711-
json_name: "TestService"
11712-
}
11713-
}
11714-
syntax: "proto3"
11715-
}
1171611701
file {
1171711702
name: "github.com/docker/swarmkit/api/watch.proto"
1171811703
package: "docker.swarmkit.v1"

api/specs.pb.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/specs.proto

+2-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,8 @@ message ContainerSpec {
372372
// Ulimits defines the list of ulimits to set in the container. This option
373373
// is equivalent to passing --ulimit to docker run.
374374
repeated Ulimit ulimits = 29;
375-
375+
// OOmScoreAdj defines the relative value used for destroying a container during an OOM
376+
// Values are between -1000 and 1000
376377
int64 oom_score_adj = 30;
377378
}
378379

api/types.proto

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ message ResourceRequirements {
8080
Resources limits = 1;
8181
Resources reservations = 2;
8282

83-
8483
// Amount of swap in bytes - can only be used together with a memory limit
8584
// -1 means unlimited
8685
// a null pointer indicates that the default behaviour of granting twice

0 commit comments

Comments
 (0)