From cb4229fe37ff28c9d348fedf568dd4c06d36b6cb Mon Sep 17 00:00:00 2001
From: AJ Bahnken <aj@ajvb.me>
Date: Wed, 24 Mar 2021 14:29:00 -0700
Subject: [PATCH] Prep for v3.7.0

---
 CHANGELOG.rst      | 15 +++++++++++++--
 version/version.go |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index e8c78fd88..9ced187ba 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,17 +1,28 @@
 Changelog
 =========
 
-Develop branch
---------------
+3.7.0
+-----
+Features:
+
+    * Add support for age (#688)
+    * Add filename to exec-file (#761)
 
 Changes:
 
     * Comments at the beginning of YAML documents are now no longer discarded (#756)
+    * On failed decryption with GPG, return the error returned by GPG to the sops user (#762)
+    * Use yaml.v3 instead of modified yaml.v2 for handling YAML files (#791)
+    * Update aws-sdk-go to version v1.37.18 (#823)
 
 Bug fixes:
 
     * Fix several problems with YAML comment handling described in #695 (#754)
 
+Project Changes:
+
+    * Switch from TravisCI to Github Actions (#792)
+
 3.6.1
 -----
 Features:
diff --git a/version/version.go b/version/version.go
index 4093f7363..cbcff60f0 100644
--- a/version/version.go
+++ b/version/version.go
@@ -11,7 +11,7 @@ import (
 )
 
 // Version represents the value of the current semantic version
-const Version = "3.6.1"
+const Version = "3.7.0"
 
 // PrintVersion handles the version command for sops
 func PrintVersion(c *cli.Context) {