Merge pull request #2217 from eiffel-fl/master

Add documentation to argument 'mem_reservation' in ContainerCollection::run

Author: shin-

docker/api/container.py

@@ -502,6 +502,7 @@ def create_host_config(self, *args, **kwargs):
                 bytes) or a string with a units identification char
                 (``100000b``, ``1000k``, ``128m``, ``1g``). If a string is
                 specified without a units character, bytes are assumed as an
+            mem_reservation (int or str): Memory soft limit.
             mem_swappiness (int): Tune a container's memory swappiness
                 behavior. Accepts number between 0 and 100.
             memswap_limit (str or int): Maximum amount of memory + swap a

docker/models/containers.py

@@ -618,7 +618,7 @@ def run(self, image, command=None, stdout=True, stderr=False,
                 (``100000b``, ``1000k``, ``128m``, ``1g``). If a string is
                 specified without a units character, bytes are assumed as an
                 intended unit.
-            mem_reservation (int or str): Memory soft limit
+            mem_reservation (int or str): Memory soft limit.
             mem_swappiness (int): Tune a container's memory swappiness
                 behavior. Accepts number between 0 and 100.
             memswap_limit (str or int): Maximum amount of memory + swap a