Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'release-1.8' into patch-51
  • Loading branch information
lcfang authored Sep 13, 2017
commit 3dc75211e6455591f77c303669e31a5edc02e20c
5 changes: 2 additions & 3 deletions docs/tasks/administer-cluster/cpu-management-policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ spec:
```

This pod runs in the `Burstable` QoS class because resource `requests` do not
equal `limits` and the `cpu` quantity is not specified. It is
evicted if shared pool is depleted. It runs in the shared pool.

equal `limits` and the `cpu` quantity is not specified. It runs in the shared
pool.

```yaml
spec:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.