From 85f696729f973c0fdba553f6590c26bc2de722ec Mon Sep 17 00:00:00 2001
From: Paul Okstad <pokstad@gitlab.com>
Date: Mon, 24 Jun 2019 08:15:23 -0700
Subject: Version 1.49.0

---
 CHANGELOG.md                                            | 16 ++++++++++++++++
 VERSION                                                 |  2 +-
 changelogs/unreleased/jc-lock-file.yml                  |  5 -----
 changelogs/unreleased/jv-dedup-delta-islands.yml        |  5 -----
 changelogs/unreleased/po-fix-worktree-cleanup-naive.yml |  5 -----
 changelogs/unreleased/po_raw_changes_encoding.yml       |  5 -----
 6 files changed, 17 insertions(+), 21 deletions(-)
 delete mode 100644 changelogs/unreleased/jc-lock-file.yml
 delete mode 100644 changelogs/unreleased/jv-dedup-delta-islands.yml
 delete mode 100644 changelogs/unreleased/po-fix-worktree-cleanup-naive.yml
 delete mode 100644 changelogs/unreleased/po_raw_changes_encoding.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94cd9c54e..a15d3b6c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Gitaly changelog
 
+## v1.49.0
+
+#### Fixed
+- Cleanup RPC now uses proper prefix for worktree clean up
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1325
+- GetRawChanges RPC uses both string and byte path fields
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1207
+
+#### Other
+- Add lock file package for atomic file writes
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1298
+
+#### Performance
+- Maintain pool packfiles
+  https://gitlab.com/gitlab-org/gitaly/merge_requests/1316
+
 ## v1.48.0
 
 #### Fixed
diff --git a/VERSION b/VERSION
index 9db5ea12f..7f3a46a84 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.48.0
+1.49.0
diff --git a/changelogs/unreleased/jc-lock-file.yml b/changelogs/unreleased/jc-lock-file.yml
deleted file mode 100644
index a6cdc2877..000000000
--- a/changelogs/unreleased/jc-lock-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add lock file package for atomic file writes
-merge_request: 1298
-author:
-type: other
diff --git a/changelogs/unreleased/jv-dedup-delta-islands.yml b/changelogs/unreleased/jv-dedup-delta-islands.yml
deleted file mode 100644
index 2b03f1dc6..000000000
--- a/changelogs/unreleased/jv-dedup-delta-islands.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Maintain pool packfiles
-merge_request: 1316
-author:
-type: performance
diff --git a/changelogs/unreleased/po-fix-worktree-cleanup-naive.yml b/changelogs/unreleased/po-fix-worktree-cleanup-naive.yml
deleted file mode 100644
index 69ac3ff23..000000000
--- a/changelogs/unreleased/po-fix-worktree-cleanup-naive.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cleanup RPC now uses proper prefix for worktree clean up
-merge_request: 1325
-author:
-type: fixed
diff --git a/changelogs/unreleased/po_raw_changes_encoding.yml b/changelogs/unreleased/po_raw_changes_encoding.yml
deleted file mode 100644
index 3e4df31bb..000000000
--- a/changelogs/unreleased/po_raw_changes_encoding.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: GetRawChanges RPC uses both string and byte path fields
-merge_request: 1207
-author:
-type: fixed
-- 
cgit v1.2.3