summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-04 11:48:45 +0100
committerRicardo Carrillo Cruz <emaildericky@gmail.com>2011-02-04 11:48:45 +0100
commitc852a4d48d2d7afe0a7d74b5da4d5b31386bbda3 (patch)
tree4b3fdecca5d391e5b2bdb06a4ea9379a13c0337c /bin
parente35ca46173a5f3bf2d1460c19249fd0bf9f5b538 (diff)
parent7783105dbbfa5c6e6d1ab9cc965929d1c4cc4eef (diff)
downloadnova-c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3.tar.gz
nova-c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3.tar.xz
nova-c852a4d48d2d7afe0a7d74b5da4d5b31386bbda3.zip
merging
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 1b70ebf17..7835ca551 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -495,9 +495,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):