From 4a9742406a756676edf5d4ee9c13574431cc7d2f Mon Sep 17 00:00:00 2001
From: Matt Boersma <matt@opdemand.com>
Date: Wed, 13 Aug 2014 21:50:07 -0600
Subject: [PATCH] chore(controller): update PyYAML to 3.11

http://pyyaml.org/wiki/PyYAML#History
---
 client/setup.py                 | 2 +-
 controller/dev_requirements.txt | 2 +-
 controller/requirements.txt     | 2 +-
 docs/docs_requirements.txt      | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/setup.py b/client/setup.py
index a3fa95c3a0..3162b52ffb 100755
--- a/client/setup.py
+++ b/client/setup.py
@@ -58,7 +58,7 @@
       long_description=LONG_DESCRIPTION,
       install_requires=[
           'docopt==0.6.1', 'python-dateutil==2.2',
-          'PyYAML==3.10', 'requests==2.2.1', 'urllib3==1.8.2'
+          'PyYAML==3.11', 'requests==2.2.1', 'urllib3==1.8.2'
       ],
       zip_safe=True,
       **KWARGS)
diff --git a/controller/dev_requirements.txt b/controller/dev_requirements.txt
index 3fecc73d48..bb0d672d00 100644
--- a/controller/dev_requirements.txt
+++ b/controller/dev_requirements.txt
@@ -1,7 +1,7 @@
 # Deis client requirements
 docopt==0.6.1
 python-dateutil==2.2
-#PyYAML==3.10
+#PyYAML==3.11
 requests==2.2.1
 urllib3==1.8.2
 
diff --git a/controller/requirements.txt b/controller/requirements.txt
index c4f3c2c43d..68215dc1ab 100644
--- a/controller/requirements.txt
+++ b/controller/requirements.txt
@@ -17,7 +17,7 @@ docker-py==0.4.0
 gunicorn==18.0
 psycopg2==2.5.2
 python-etcd==0.3.0
-PyYAML==3.10
+PyYAML==3.11
 redis==2.9.1
 static==1.0.2
 South==1.0
diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
index e03c8f12bf..0bf9ae8f0e 100644
--- a/docs/docs_requirements.txt
+++ b/docs/docs_requirements.txt
@@ -20,13 +20,13 @@ docker-py==0.4.0
 gunicorn==18.0
 psycopg2==2.5.2
 python-etcd==0.3.0
-PyYAML==3.10
+PyYAML==3.11
 South==1.0
 
 # Deis client requirements
 docopt==0.6.1
 python-dateutil==2.2
-#PyYAML==3.10
+#PyYAML==3.11
 requests==2.2.1
 urllib3==1.8.2