Updated openstack/openstack
Project: openstack/requirements  eb52e76fd5ea1bbd27efad60556f17a630e588c0
null
workaround pypy in requirements

pypy is blocking all requirements merge at the moment, which is
problematic as we've got some changes that should land prior to
icehouse. Implement the work around that fungi posted to IRC.

Related-Bug: #1290562
Change-Id: I973e71f96903f687c1e3b6c00db93949d5b88d2f
Updated openstack/openstack
Project: openstack/nova  208ef61a0680788cf7798074c23399911fed3c64
null
Delete meaningless lines in test_server_metadata.py

Some meaningless lines were found in test_server_metadata.py.
I deleted those.

Change-Id: I3f04bc0d4c9048281293ed78e4ba7ea4a2b26864