From 05c96d0371ddb4c71d15c39f3dbe996f0e9aa38c Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Sat, 23 Dec 2017 08:55:54 +0800 Subject: [PATCH] Remove duplicated release note There are two release note file for removed-as-of-queens. Merge them into one. Change-Id: I06234a4585a78050be8a8c8b13a58fed9e34463b --- .../notes/removed-as-of-queens-5d2b655756603beb.yaml | 5 ----- .../notes/removed-as-of-queens-94c04e88c08f89aa.yaml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 releasenotes/notes/removed-as-of-queens-5d2b655756603beb.yaml diff --git a/releasenotes/notes/removed-as-of-queens-5d2b655756603beb.yaml b/releasenotes/notes/removed-as-of-queens-5d2b655756603beb.yaml deleted file mode 100644 index 2f2d74d157..0000000000 --- a/releasenotes/notes/removed-as-of-queens-5d2b655756603beb.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -other: - - > - [`blueprint removed-as-of-queens `_] - The ``admin_token_auth`` middleware is removed now. The related doc is removed as well. diff --git a/releasenotes/notes/removed-as-of-queens-94c04e88c08f89aa.yaml b/releasenotes/notes/removed-as-of-queens-94c04e88c08f89aa.yaml index 0052116b29..35e6475b9e 100644 --- a/releasenotes/notes/removed-as-of-queens-94c04e88c08f89aa.yaml +++ b/releasenotes/notes/removed-as-of-queens-94c04e88c08f89aa.yaml @@ -9,3 +9,7 @@ other: - > The config option ``rolling_upgrade_password_hash_compat`` is removed. It is only used for rolling-upgrade from Ocata release to Pike release. + - > + [`blueprint removed-as-of-queens `_] + The ``admin_token_auth`` middleware is removed now. The related doc is + removed as well.