Merge "Fix swift memcache and device properties"
authorJenkins <jenkins@review.openstack.org>
Fri, 1 Aug 2014 05:04:04 +0000 (05:04 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 1 Aug 2014 05:04:04 +0000 (05:04 +0000)

Trivial merge