docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed duplicate mem_limit arg desc; type now consistent accross models (float->int) 

Signed-off-by: Peter Slovak <peter.slovak@websupport.sk>
This commit is contained in:
Peter Slovak 2017-04-07 00:22:22 +02:00
parent 1f609208fd
commit c80762d376
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/models/containers.py
View File

@ -510,14 +510,12 @@ class ContainerCollection(Collection):
driver. driver.
mac_address (str): MAC address to assign to the container. mac_address (str): MAC address to assign to the container.
mem_limit (float or str): Memory limit. Accepts float values mem_limit (int or str): Memory limit. Accepts float values
(which represent the memory limit of the created container in (which represent the memory limit of the created container in
bytes) or a string with a units identification char bytes) or a string with a units identification char
(``100000b``, ``1000k``, ``128m``, ``1g``). If a string is (``100000b``, ``1000k``, ``128m``, ``1g``). If a string is
specified without a units character, bytes are assumed as an specified without a units character, bytes are assumed as an
intended unit. intended unit.
mem_limit (str or int): Maximum amount of memory container is
allowed to consume. (e.g. ``1G``).
mem_swappiness (int): Tune a container's memory swappiness mem_swappiness (int): Tune a container's memory swappiness
behavior. Accepts number between 0 and 100. behavior. Accepts number between 0 and 100.
memswap_limit (str or int): Maximum amount of memory + swap a memswap_limit (str or int): Maximum amount of memory + swap a