Remove django-evolution; we don't need it anymore and it downgrades django
diff --git a/containers/xos-compose.yml b/containers/docker-compose.yml
similarity index 100%
rename from containers/xos-compose.yml
rename to containers/docker-compose.yml
diff --git a/containers/xos/Dockerfile b/containers/xos/Dockerfile
index 639cbd5..46e88b3 100644
--- a/containers/xos/Dockerfile
+++ b/containers/xos/Dockerfile
@@ -29,7 +29,7 @@
python-setuptools \
tar \
wget \
-##### observer dependencies
+##### observer dependencies
python-keystoneclient \
python-novaclient \
python-neutronclient \
@@ -50,11 +50,11 @@
django-timezones \
djangorestframework==2.4.4 \
dnslib \
- lxml \
+ lxml \
markdown \
netaddr \
pyOpenSSL \
- psycopg2 \
+ psycopg2 \
python-ceilometerclient \
python-dateutil \
python-keyczar \
@@ -66,7 +66,6 @@
RUN easy_install --upgrade httplib2
RUN easy_install \
- django_evolution \
python_gflags \
google_api_python_client \
httplib2.ca_certs_locater