summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorRyan Lane <rlane@wikimedia.org>2011-03-03 23:04:11 +0000
committerRyan Lane <rlane@wikimedia.org>2011-03-03 23:04:11 +0000
commitdf3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4 (patch)
treeaab853348a2df9f5cdb26a77dd836d4f2083f119 /etc
parent4c50ddee48971c76f0f6252295747b89de5d3697 (diff)
parent7ca1669603132e3afd14606dda3f95ccbce08a41 (diff)
downloadnova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.tar.gz
nova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.tar.xz
nova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.zip
Merge from trunk
Diffstat (limited to 'etc')
-rw-r--r--etc/api-paste.ini (renamed from etc/nova-api.conf)3
1 files changed, 0 insertions, 3 deletions
diff --git a/etc/nova-api.conf b/etc/api-paste.ini
index f0e749805..9f7e93d4c 100644
--- a/etc/nova-api.conf
+++ b/etc/api-paste.ini
@@ -1,6 +1,3 @@
-[DEFAULT]
-verbose = 1
-
#######
# EC2 #
#######