diff options
| author | Joffrey F <joffrey@docker.com> | 2015-02-11 14:02:21 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2015-02-11 14:02:21 -0800 |
| commit | e2233fcee11e5d74b1849e502c78cc2eca841a7e (patch) | |
| tree | 5b128569fa447cc7c928db0583ca3a02f304ee68 /docker/utils/__init__.py | |
| parent | c5f4c7e7d2b8cd00b2c4505c2f4be940c373d187 (diff) | |
| download | docker-py-memoryswap.tar.gz | |
* Moved _container_config to utils.create_container_configmemoryswap
* memswap_limit can now be provided as a string, similar to mem_limit
Diffstat (limited to 'docker/utils/__init__.py')
| -rw-r--r-- | docker/utils/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/utils/__init__.py b/docker/utils/__init__.py index af6c6aa..0731362 100644 --- a/docker/utils/__init__.py +++ b/docker/utils/__init__.py @@ -1,5 +1,6 @@ from .utils import ( compare_version, convert_port_bindings, convert_volume_binds, mkbuildcontext, ping, tar, parse_repository_tag, parse_host, - kwargs_from_env, convert_filters, create_host_config + kwargs_from_env, convert_filters, create_host_config, + create_container_config, parse_bytes ) # flake8: noqa |