summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJosh Kearney <josh.kearney@rackspace.com>2011-02-11 15:18:32 -0600
committerJosh Kearney <josh.kearney@rackspace.com>2011-02-11 15:18:32 -0600
commitfa4e3af4c8d4161cdb90f0ac54f357e9724cbc22 (patch)
tree867e6040e861462a0324490cbb3bb51cd0052e54 /bin
parent4a058908db774bfebce4ece814534225e123345c (diff)
parentc42ace8e605b987e683372efb4913d85ee472a70 (diff)
Merged trunk
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index bd2fc0e81..90cd314a8 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -496,9 +496,9 @@ class NetworkCommands(object):
cidr=fixed_range,
num_networks=int(num_networks),
network_size=int(network_size),
+ cidr_v6=fixed_range_v6,
vlan_start=int(vlan_start),
- vpn_start=int(vpn_start),
- cidr_v6=fixed_range_v6)
+ vpn_start=int(vpn_start))
class ServiceCommands(object):