summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoffrey F <f.joffrey@gmail.com>2015-08-18 12:33:13 -0700
committerJoffrey F <f.joffrey@gmail.com>2015-08-18 12:33:13 -0700
commita6064e356e1c50f501c18a6b6ba075b88d6565a4 (patch)
tree93cb9ca2f03628afd8fae01ce67a6e2195a17548
parent3cd66b66bae3759a4d8252490bb081fbd9102ca8 (diff)
parentc135266233456cbd8269a72e4034d7dde8897050 (diff)
downloaddocker-py-a6064e356e1c50f501c18a6b6ba075b88d6565a4.tar.gz
Merge pull request #724 from bedwards/bedwards-fluentd-patch
Update types.py to support fluentd logging driver
-rw-r--r--docker/utils/types.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/utils/types.py b/docker/utils/types.py
index ca67467..6ef9687 100644
--- a/docker/utils/types.py
+++ b/docker/utils/types.py
@@ -6,9 +6,11 @@ class LogConfigTypesEnum(object):
'json-file',
'syslog',
'journald',
+ 'gelf',
+ 'fluentd',
'none'
)
- JSON, SYSLOG, JOURNALD, NONE = _values
+ JSON, SYSLOG, JOURNALD, GELF, FLUENTD, NONE = _values
class DictType(dict):