summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-02-20 01:02:46 +0000
committerGerrit Code Review <review@openstack.org>2020-02-20 01:02:46 +0000
commitc4deee6fa4d87875fb9c37abf31ebf5816c3a542 (patch)
tree1ab6c63d7a79056a8a35decaf5452496b1efca04
parent9bafb71f9545ae8d7d94989b5012072eb29de92d (diff)
parentb07b90f02b52967fc119cfae5ea3369fc0c3908a (diff)
downloadcinder-c4deee6fa4d87875fb9c37abf31ebf5816c3a542.tar.gz
Merge "Tell reno to ignore the kilo branch" into stable/queens
-rw-r--r--.gitignore4
-rw-r--r--reno.yaml4
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 8ac1c28fd..736679af5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,6 @@ api-ref/build
# Files created by releasenotes build
releasenotes/build
-contrib/blockbox/.db_data
+contrib/block-box/.db_data
+RELEASENOTES.rst
+releasenotes/notes/reno.cache
diff --git a/reno.yaml b/reno.yaml
new file mode 100644
index 000000000..dd0aac790
--- /dev/null
+++ b/reno.yaml
@@ -0,0 +1,4 @@
+---
+# Ignore the kilo-eol tag because that branch does not work with reno
+# and contains no release notes.
+closed_branch_tag_re: "(.+)(?<!kilo)-eol"