summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJiří Suchomel <jsuchome@suse.cz>2015-11-30 10:25:09 +0100
committerJiří Suchomel <jsuchome@suse.cz>2015-11-30 11:08:10 +0100
commitb78f5189d175b954c27b0afb4742517d2a189d0e (patch)
treeb4a10fe757b82a4da8f36cf2cb4e61b78a899f19 /contrib
parent9e2e459def873a95e6d77e6bab03d09718328a70 (diff)
downloadheat-b78f5189d175b954c27b0afb4742517d2a189d0e.tar.gz
Remove default value for mem_limit to keep up with docker-py
Change-Id: I04d9be374de7bf00cf89cc6e24aa749cb6686a16 Closes-Bug: 1521109
Diffstat (limited to 'contrib')
-rw-r--r--contrib/heat_docker/heat_docker/resources/docker_container.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/heat_docker/heat_docker/resources/docker_container.py b/contrib/heat_docker/heat_docker/resources/docker_container.py
index ad830ebac..1ba0c82eb 100644
--- a/contrib/heat_docker/heat_docker/resources/docker_container.py
+++ b/contrib/heat_docker/heat_docker/resources/docker_container.py
@@ -115,8 +115,7 @@ class DockerContainer(resource.Resource):
),
MEMORY: properties.Schema(
properties.Schema.INTEGER,
- _('Memory limit (Bytes).'),
- default=0
+ _('Memory limit (Bytes).')
),
PORT_SPECS: properties.Schema(
properties.Schema.LIST,