Updated requirements files and deis/server SHA.

mboersma · Gabriel Monroy · commit 0fb67df19df1 · 2014-02-12T12:20:59.000-07:00
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -15,7 +15,7 @@
       "ref": "e172d9f1347f9876eda626866cf0c45a3ceaea64"
     },
     "docker": {
-      "locked_version": "0.28.0"
+      "locked_version": "0.29.0"
     },
     "git": {
       "locked_version": "2.9.0"
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -13,8 +13,10 @@ gunicorn==18.0
 paramiko==1.12.1
 psycopg2==2.5.2
 pycrypto==2.6.1
+python-etcd==0.3.0
 pyrax==1.6.2
 PyYAML==3.10
+redis==2.8.0
 South==0.8.4
 
 # Deis client requirements
diff --git a/docs/docs_requirements.txt b/docs/docs_requirements.txt
@@ -5,6 +5,7 @@ Django==1.6.2
 django-json-field==0.5.5
 djangorestframework==2.3.12
 dop==0.1.4
+etcd==2.0.1
 paramiko==1.12.1
 pyrax==1.6.2
 PyYAML==3.10
diff --git a/images/server b/images/server
@@ -1 +1 @@
-Subproject commit 2de726b3fbf422162a12283f71871f4e29853d3f
+Subproject commit 246c0283463492867bfc5aba8bfe00935b196930
