Skip to content

Commit

Permalink
Merge pull request kubernetes#21983 from gmarek/influxdb
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Feb 26, 2016
2 parents 95b7fbf + 98eb12e commit eaffdf8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ spec:
# keep request = limit to keep this container in guaranteed class
limits:
cpu: 100m
memory: 200Mi
memory: 500Mi
requests:
cpu: 100m
memory: 200Mi
memory: 500Mi
ports:
- containerPort: 8083
hostPort: 8083
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
resources:
limits:
cpu: 100m
memory: 200Mi
memory: 500Mi
ports:
- containerPort: 8083
hostPort: 8083
Expand Down

0 comments on commit eaffdf8

Please sign in to comment.