summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-04 17:04:47 +0000
committerGerrit Code Review <review@openstack.org>2012-10-04 17:04:47 +0000
commit3c8ed4ec14cab8ae6ac4f88286baac090800fa94 (patch)
tree813d532368400d25e930779c206092086417c3a3
parentf96fe43e63da0544e18fcf7631eb9a059b1bafe8 (diff)
parent5bc0946d17ea19417229b202bcf9b4b549570c42 (diff)
downloadnova-3c8ed4ec14cab8ae6ac4f88286baac090800fa94.tar.gz
nova-3c8ed4ec14cab8ae6ac4f88286baac090800fa94.tar.xz
nova-3c8ed4ec14cab8ae6ac4f88286baac090800fa94.zip
Merge "Zmq register opts fix in receiver"
-rwxr-xr-xbin/nova-rpc-zmq-receiver2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver
index b6517ad1e..5636718a2 100755
--- a/bin/nova-rpc-zmq-receiver
+++ b/bin/nova-rpc-zmq-receiver
@@ -41,11 +41,11 @@ from nova import utils
FLAGS = flags.FLAGS
FLAGS.register_opts(rpc.rpc_opts)
+FLAGS.register_opts(impl_zmq.zmq_opts)
def main():
flags.parse_args(sys.argv)
- impl_zmq.register_opts(FLAGS)
logging.setup("nova")
utils.monkey_patch()