diff options
| author | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
|---|---|---|
| committer | Justin Santa Barbara <justin@fathomdb.com> | 2011-03-07 15:30:58 -0800 |
| commit | be54e37bbd79293ce41f8fa8dfe40022aebb6fff (patch) | |
| tree | 8a46ee357f8fec2647bc9839c63b2053db343758 /etc | |
| parent | 8e0fd37ddfbe88df296cf45583f0b3e4fa4d7a75 (diff) | |
| parent | bb4e0c940f49564c740a1863d110106d9018e8d4 (diff) | |
| download | nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.gz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.tar.xz nova-be54e37bbd79293ce41f8fa8dfe40022aebb6fff.zip | |
Merged with trunk and fixed conflict. Sigh.
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 |