diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-03-09 00:38:37 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-03-09 00:38:37 +0000 |
| commit | 25549162650581e8d458dcd10b0755741a4e8c74 (patch) | |
| tree | a97fcf3931a737238470399216d1c927b1e56493 /etc | |
| parent | b8a0fdca4df454a4d60df40d06ebd82bcc2ba3da (diff) | |
| parent | a02c0db7cd72aa3d716116c87cab98b243b5b618 (diff) | |
merge trunk
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/api-paste.ini (renamed from etc/nova-api.conf) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/etc/nova-api.conf b/etc/api-paste.ini index 9f7e93d4c..9f7e93d4c 100644 --- a/etc/nova-api.conf +++ b/etc/api-paste.ini |