Merge "Fix BLOCKSTORAGESCALE and SWIFTSTORAGESCALE in Makefile"
authorJenkins <jenkins@review.openstack.org>
Thu, 14 Aug 2014 15:47:29 +0000 (15:47 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 14 Aug 2014 15:47:29 +0000 (15:47 +0000)

Trivial merge