From caeb4ae40448bb8978a5df82c04898a19db4b1d5 Mon Sep 17 00:00:00 2001
From: Nolan Brubaker <brubakern@vmware.com>
Date: Tue, 21 Jul 2020 14:14:41 -0400
Subject: [PATCH] Update changelogs for v1.4.2 (#2705)

Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
---
 changelogs/CHANGELOG-1.4.md                | 25 ++++++++++++++++++++++
 changelogs/unreleased/2683-ashish-amarnath |  1 -
 changelogs/unreleased/2696-nrb             |  1 -
 3 files changed, 25 insertions(+), 2 deletions(-)
 delete mode 100644 changelogs/unreleased/2683-ashish-amarnath
 delete mode 100644 changelogs/unreleased/2696-nrb

diff --git a/changelogs/CHANGELOG-1.4.md b/changelogs/CHANGELOG-1.4.md
index a407dc4df..354e68514 100644
--- a/changelogs/CHANGELOG-1.4.md
+++ b/changelogs/CHANGELOG-1.4.md
@@ -1,3 +1,28 @@
+## v1.4.2
+### 2020-07-13
+
+### Download
+https://github.com/vmware-tanzu/velero/releases/tag/v1.4.2
+
+### Container Image
+`velero/velero:v1.4.2`
+
+### Documentation
+https://velero.io/docs/v1.4/
+
+### Upgrading
+https://velero.io/docs/v1.4/upgrade-to-1.4/
+
+### All Changes
+  * log a warning instead of erroring if an additional item returned from a plugin can't be found in the Kubernetes API (#2595, @skriss)
+  * Adjust restic default time out to 4 hours and base pod resource requests to 500m CPU/512Mi memory. (#2696, @nrb)
+  * capture version of the CRD prior before invoking the remap_crd_version backup item action (#2683, @ashish-amarnath)
+
+
+## v1.4.1
+
+This tag was created in code, but has no associated docker image due to misconfigured building infrastructure. v1.4.2 fixes this.
+
 ## v1.4.0
 ### 2020-05-26
 
diff --git a/changelogs/unreleased/2683-ashish-amarnath b/changelogs/unreleased/2683-ashish-amarnath
deleted file mode 100644
index 014606d7e..000000000
--- a/changelogs/unreleased/2683-ashish-amarnath
+++ /dev/null
@@ -1 +0,0 @@
-capture version of the CRD prior before invoking the remap_crd_version backup item action
diff --git a/changelogs/unreleased/2696-nrb b/changelogs/unreleased/2696-nrb
deleted file mode 100644
index 5e91e5994..000000000
--- a/changelogs/unreleased/2696-nrb
+++ /dev/null
@@ -1 +0,0 @@
-Adjust restic default time out to 4 hours and base pod resource requests to 500m CPU/512Mi memory.