From 8a9d18cc86652a57aa31061b419e6638bc1543a1 Mon Sep 17 00:00:00 2001
From: Felix Fontein <felix@fontein.de>
Date: Thu, 14 Jan 2021 16:07:29 +0100
Subject: [PATCH] Release 1.3.4.

---
 CHANGELOG.rst                                  | 18 ++++++++++++++++++
 changelogs/changelog.yaml                      | 13 +++++++++++++
 changelogs/fragments/1.3.4.yml                 |  1 -
 changelogs/fragments/1614_npm.yml              |  2 --
 .../cve_bitbucket_pipeline_variable.yml        |  2 --
 5 files changed, 31 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/1.3.4.yml
 delete mode 100644 changelogs/fragments/1614_npm.yml
 delete mode 100644 changelogs/fragments/cve_bitbucket_pipeline_variable.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 7453a970e0..313f7027fc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,24 @@ Community General Release Notes
 .. contents:: Topics
 
 
+v1.3.4
+======
+
+Release Summary
+---------------
+
+Bugfix/security release that addresses CVE-2021-20180.
+
+Security Fixes
+--------------
+
+- bitbucket_pipeline_variable - **CVE-2021-20180** - hide user sensitive information which are marked as ``secured`` from logging into the console (https://github.com/ansible-collections/community.general/pull/1635).
+
+Bugfixes
+--------
+
+- npm - handle json decode exception while parsing command line output (https://github.com/ansible-collections/community.general/issues/1614).
+
 v1.3.3
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index ef1e7c0e82..3f3911840a 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1802,3 +1802,16 @@ releases:
     - kubevirt-migration.yml
     - snmp_facts.yml
     release_date: '2021-01-13'
+  1.3.4:
+    changes:
+      bugfixes:
+      - npm - handle json decode exception while parsing command line output (https://github.com/ansible-collections/community.general/issues/1614).
+      release_summary: Bugfix/security release that addresses CVE-2021-20180.
+      security_fixes:
+      - bitbucket_pipeline_variable - **CVE-2021-20180** - hide user sensitive information
+        which are marked as ``secured`` from logging into the console (https://github.com/ansible-collections/community.general/pull/1635).
+    fragments:
+    - 1.3.4.yml
+    - 1614_npm.yml
+    - cve_bitbucket_pipeline_variable.yml
+    release_date: '2021-01-14'
diff --git a/changelogs/fragments/1.3.4.yml b/changelogs/fragments/1.3.4.yml
deleted file mode 100644
index 5ef346be7f..0000000000
--- a/changelogs/fragments/1.3.4.yml
+++ /dev/null
@@ -1 +0,0 @@
-release_summary: Bugfix/security release that addresses CVE-2021-20180.
diff --git a/changelogs/fragments/1614_npm.yml b/changelogs/fragments/1614_npm.yml
deleted file mode 100644
index 0d39b1b6fb..0000000000
--- a/changelogs/fragments/1614_npm.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-bugfixes:
-- npm - handle json decode exception while parsing command line output (https://github.com/ansible-collections/community.general/issues/1614).
diff --git a/changelogs/fragments/cve_bitbucket_pipeline_variable.yml b/changelogs/fragments/cve_bitbucket_pipeline_variable.yml
deleted file mode 100644
index 1315755bb0..0000000000
--- a/changelogs/fragments/cve_bitbucket_pipeline_variable.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-security_fixes:
-- 'bitbucket_pipeline_variable - **CVE-2021-20180** - hide user sensitive information which are marked as ``secured`` from logging into the console (https://github.com/ansible-collections/community.general/pull/1635).'