summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a90a414002..ca61a4883f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ api-guide/build/*
api-ref/build/*
etc/nova/nova.conf.sample
etc/nova/policy.yaml.sample
+etc/nova/policy.yaml.merged
instances
keeper
keys