diff options
| author | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-08 09:48:00 +0000 |
|---|---|---|
| committer | Salvatore Orlando <salvatore.orlando@eu.citrix.com> | 2011-03-08 09:48:00 +0000 |
| commit | 2dd533848668409c7406fa6c434c8783b3d4e110 (patch) | |
| tree | d85bee415f3ab13d2d50abb794f189a80efc5fb2 /etc | |
| parent | db14d929cdbdae2f6f3b91b0be960116164f052c (diff) | |
| parent | bb4e0c940f49564c740a1863d110106d9018e8d4 (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 |