merge

2011-01-07 05:59:30 +03:00
parent 0ea6df22ad
commit 6ad624939e
4 changed files with 79 additions and 1 deletions
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -285,6 +285,5 @@ DEFINE_string('image_service', 'nova.image.s3.S3ImageService',
 DEFINE_string('host', socket.gethostname(),
              'name of this node')

-# UNUSED
 DEFINE_string('node_availability_zone', 'nova',
              'availability zone of this node')