Merge "Use the proper parameter to set --master"
authorJenkins <jenkins@review.openstack.org>
Thu, 28 May 2015 11:37:37 +0000 (11:37 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 28 May 2015 11:37:37 +0000 (11:37 +0000)

Trivial merge