diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-02-15 15:01:41 -0500 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-02-15 15:01:41 -0500 |
| commit | 8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e (patch) | |
| tree | a7f13616e6d7cd393b717e7c59766d43b9a07c8c /nova/flags.py | |
| parent | 4a4a3f04b78ba2cbaa0d02ecf0f7cd3cf580901b (diff) | |
| parent | 273e6703a9e4f7e3b7810f204ffb6bb0f86602bd (diff) | |
| download | nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.gz nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.tar.xz nova-8074ecf9f8e8d4e24909e2255e40da4c5fa9ce9e.zip | |
merging trunk back in; updating Authors conflict
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index 1d8eba94f..3ba3fe6fa 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -286,8 +286,8 @@ DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'), DEFINE_string('sql_connection', 'sqlite:///$state_path/nova.sqlite', 'connection string for sql database') -DEFINE_string('sql_idle_timeout', - '3600', +DEFINE_integer('sql_idle_timeout', + 3600, 'timeout for idle sql database connections') DEFINE_integer('sql_max_retries', 12, 'sql connection attempts') DEFINE_integer('sql_retry_interval', 10, 'sql connection retry interval') |