Merge "Update requirements to stable/havana." into release-0.4

This commit is contained in:
Jenkins 2013-12-16 08:12:19 +00:00 committed by Gerrit Code Review
commit a512ae2314
2 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ kombu>=2.4.8
pycrypto>=2.6
iso8601>=0.1.8
six>=1.4.1
netaddr>=0.7.6
netaddr
# Note you will need gcc buildtools installed and must
# have installed libxml headers for lxml to be successfully
@ -28,7 +28,7 @@ Paste
passlib
jsonschema>=1.3.0,!=1.4.0
python-keystoneclient>=0.4.1
python-keystoneclient>=0.3.2
oslo.config>=1.2.0
# Please, revert to murano-common>=x.x.x before release
http://tarballs.openstack.org/murano-common/murano-common-master.tar.gz#egg=muranocommon-0.4

View File

@ -10,7 +10,7 @@ nose-exclude
openstack.nose_plugin>=0.7
nosehtmloutput>=0.0.3
pep8==1.3.3
sphinx>=1.1.2
sphinx>=1.1.2,<1.2
requests>=1.1
testtools>=0.9.32
mock>=1.0