diff options
| author | Ed Leafe <ed@leafe.com> | 2010-12-28 16:02:46 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2010-12-28 16:02:46 -0600 |
| commit | d531e873b97a8ff92d1534811f702e89a8cf60a7 (patch) | |
| tree | 75d2c5e5a44baeb1ddb2ce93d3e61d32f1225095 /bin | |
| parent | ef8e4495f5ed195a08be6c02b3eb3326f6403bb6 (diff) | |
| parent | 675ca7c5f38af0fa1150936e881482aa20fdaa45 (diff) | |
merge from trunk
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-dhcpbridge | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge index 81b9b6dd3..828aba3d1 100755 --- a/bin/nova-dhcpbridge +++ b/bin/nova-dhcpbridge @@ -110,7 +110,6 @@ def main(): FLAGS.num_networks = 5 path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', - '_trial_temp', 'nova.sqlite')) FLAGS.sql_connection = 'sqlite:///%s' % path action = argv[1] |