Merge "Wire in list of controller nodes as memcache_servers for Swift proxy"
authorJenkins <jenkins@review.openstack.org>
Thu, 9 Apr 2015 20:18:38 +0000 (20:18 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 9 Apr 2015 20:18:38 +0000 (20:18 +0000)

Trivial merge