Merge pull request #332 from Cerberus98/master

Fixes building the tox venv after upstream change

.travis.yml

@@ -2,6 +2,8 @@ language: python
 python:
   - "2.7"
   - "2.6"
+before_install:
+  - "export NO_EVENTLET=1"
 install:
   - pip install -r requirements.txt -r test-requirements.txt . --use-mirrors
 before_script:

tox.ini

@@ -9,6 +9,7 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
          NOSE_OPENSTACK_STDOUT=1
+         NO_EVENTLET=1
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands = nosetests {posargs}