summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2011-03-08 12:39:58 -0800
committerVishvananda Ishaya <vishvananda@gmail.com>2011-03-08 12:39:58 -0800
commitccbc8f6464ce2da0fd62e154a86b51b1110afb6f (patch)
tree69821d4b707418c358f6ede2226c0921940d245e /etc
parent5bb77cb83ea443e5e3ae4b4000763e4289f8e87a (diff)
parentb238805d2ee9c19d3fb9b4dc43fa404630bdfaab (diff)
merged 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