diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-24 17:01:48 -0800 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-02-24 17:01:48 -0800 |
| commit | eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e (patch) | |
| tree | aa9054e2822df24241799074edb4652da71ba622 /etc | |
| parent | 307dcb7906ff066e2883cdee8998dfa78ebc8221 (diff) | |
| parent | bb4e0c940f49564c740a1863d110106d9018e8d4 (diff) | |
| download | nova-eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e.tar.gz nova-eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e.tar.xz nova-eab99bbcdb02aa9bd330b01f2d27a297ab6b7f2e.zip | |
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 |