From c6fb88c2984717cc8fd2359f623066907dbfe76b Mon Sep 17 00:00:00 2001
From: Manuel <5673677+mtrezza@users.noreply.github.com>
Date: Thu, 19 Aug 2021 00:22:52 +0200
Subject: [PATCH] adapt for master merge (#7501)

---
 CHANGELOG.md      | 33 +++++++++++++++++++--------------
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41d21f6b..c6cebaa2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,17 +2,18 @@
 
 Jump directly to a version:
 
-| 4.x                              |
-|----------------------------------|
-| [**4.5.1 (latest release)**](#451) |
-| [4.5.0](#450)                    |
-| [4.4.0](#440)                    |
-| [4.3.0](#430)                    |
-| [4.2.0](#420)                    |
-| [4.1.0](#410)                    |
-| [4.0.2](#402)                    |
-| [4.0.1](#401)                    |
-| [4.0.0](#400)                    |
+| 4.x                                |
+|------------------------------------|
+| [**4.5.2 (latest release)**](#452) |
+| [4.5.1](#451)                      |
+| [4.5.0](#450)                      |
+| [4.4.0](#440)                      |
+| [4.3.0](#430)                      |
+| [4.2.0](#420)                      |
+| [4.1.0](#410)                      |
+| [4.0.2](#402)                      |
+| [4.0.1](#401)                      |
+| [4.0.0](#400)                      |
 
 <details>
 <summary>Previous Versions</summary>
@@ -89,7 +90,7 @@ Jump directly to a version:
 ___
 
 ## Unreleased (Master Branch)
-[Full Changelog](https://github.com/parse-community/parse-server/compare/4.5.1...master)
+[Full Changelog](https://github.com/parse-community/parse-server/compare/4.5.2...master)
 ### Breaking Changes
 - Improved schema caching through database real-time hooks. Reduces DB queries, decreases Parse Query execution time and fixes a potential schema memory leak. If multiple Parse Server instances connect to the same DB (for example behind a load balancer), set the [Parse Server Option](https://parseplatform.org/parse-server/api/master/ParseServerOptions.html) `databaseOptions.enableSchemaHooks: true` to enable this feature and keep the schema in sync across all instances. Failing to do so will cause a schema change to not propagate to other instances and re-syncing will only happen when these instances restart. The options `enableSingleSchemaCache` and `schemaCacheTTL` have been removed. To use this feature with MongoDB, a replica set cluster with [change stream](https://docs.mongodb.com/manual/changeStreams/#availability) support is required. (Diamond Lewis, SebC) [#7214](https://github.com/parse-community/parse-server/issues/7214)
 - Added file upload restriction. File upload is now only allowed for authenticated users by default for improved security. To allow file upload also for Anonymous Users or Public, set the `fileUpload` parameter in the [Parse Server Options](https://parseplatform.org/parse-server/api/master/ParseServerOptions.html) (dblythy, Manuel Trezza) [#7071](https://github.com/parse-community/parse-server/pull/7071)
@@ -141,11 +142,15 @@ ___
 - Added runtime deprecation warnings (Manuel Trezza) [#7451](https://github.com/parse-community/parse-server/pull/7451)
 - Add ability to pass context of an object via a header, X-Parse-Cloud-Context, for Cloud Code triggers. The header addition allows client SDK's to add context without injecting _context in the body of JSON objects (Corey Baker) [#7437](https://github.com/parse-community/parse-server/pull/7437)
 
-## 4.5.1
-[Full Changelog](https://github.com/parse-community/parse-server/compare/4.5.0...4.5.1)
+## 4.5.2
+[Full Changelog](https://github.com/parse-community/parse-server/compare/4.5.0...4.5.2)
+
 ### Security Fixes
 - SECURITY FIX: Fixes incorrect session property `authProvider: password` of anonymous users. When signing up an anonymous user, the session field `createdWith` indicates incorrectly that the session has been created using username and password with `authProvider: password`, instead of an anonymous sign-up with `authProvider: anonymous`. This fixes the issue by setting the correct `authProvider: anonymous` for future sign-ups of anonymous users. This fix does not fix incorrect `authProvider: password` for existing sessions of anonymous users. Consider this if your app logic depends on the `authProvider` field. (Corey Baker) [GHSA-23r4-5mxp-c7g5](https://github.com/parse-community/parse-server/security/advisories/GHSA-23r4-5mxp-c7g5)
 
+## 4.5.1
+*This version was published by mistake and was deprecated.*
+
 ## 4.5.0
 [Full Changelog](https://github.com/parse-community/parse-server/compare/4.4.0...4.5.0)
 ### Breaking Changes
diff --git a/package-lock.json b/package-lock.json
index 635954ed..087da4f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 9baa1471..0b886005 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "4.5.1",
+  "version": "4.5.2",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {