Merge "Sync code from oslo incubator"

This commit is contained in:
Jenkins 2014-04-30 15:49:09 +00:00 committed by Gerrit Code Review
commit 7dbb26a6af

Diff Content Not Available