summaryrefslogtreecommitdiff
path: root/compose/const.py
diff options
context:
space:
mode:
authorDaniel Nephin <dnephin@gmail.com>2015-06-14 17:11:29 -0400
committerDaniel Nephin <dnephin@gmail.com>2015-06-14 17:18:27 -0400
commit06db577105d54394842b4634038a54e55e83252f (patch)
treedb8768ac85ca64518c0a54a9ccb8104b4656cd41 /compose/const.py
parentc24d5380e69a2b27a4c7b0c34ff05aac5794de26 (diff)
Move converge() to a test module, and use a short timeout for tests.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Diffstat (limited to 'compose/const.py')
-rw-r--r--compose/const.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/compose/const.py b/compose/const.py
index f76fb572..709c3a10 100644
--- a/compose/const.py
+++ b/compose/const.py
@@ -1,4 +1,5 @@
+DEFAULT_TIMEOUT = 10
LABEL_CONTAINER_NUMBER = 'com.docker.compose.container-number'
LABEL_ONE_OFF = 'com.docker.compose.oneoff'
LABEL_PROJECT = 'com.docker.compose.project'