From fecbb2d7ff7abdf20bfe2bb44ea678770579edfa Mon Sep 17 00:00:00 2001
From: Florent Vilmart <florent@flovilmart.com>
Date: Thu, 26 Oct 2017 17:15:32 -0400
Subject: [PATCH] :zap: Release 2.6.5 (#4298)

---
 CHANGELOG.md | 20 +++++++++++++++++---
 package.json |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9c24d310d..02cf5dc4e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,26 @@
 ## Parse Server Changelog
 
 ### master
-[Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.4...master)
+[Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.5...master)
+
+### 2.6.5
+[Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.5...2.6.4)
+
+#### New Features:
+* Adds support for read-only masterKey, thanks to [Florent Vilmart](https://github.com/flovilmart)
+* Adds support for relative time queries (mongodb only), thanks to [Marvel Mathew](https://github.com/marvelm)
+
+#### Improvements:
+* Handle possible afterSave exception, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb)
+* Add support for expiration interval in Push, thanks to [Marvel Mathew](https://github.com/marvelm)
+
+#### Bug Fixes:
+* The REST API key was improperly inferred from environment when using the CLI, thanks to [Florent Vilmart](https://github.com/flovilmart)
 
 ### 2.6.4
 [Full Changelog](https://github.com/ParsePlatform/parse-server/compare/2.6.4...2.6.3)
 
-### Improvements:
+#### Improvements:
 * Improves management of configurations and default values, thanks to [Florent Vilmart](https://github.com/flovilmart)
 * Adds ability to start ParseServer with `ParseServer.start(options)`, thanks to [Florent Vilmart](https://github.com/flovilmart)
 * Adds request original IP to cloud code hooks, thanks to [Gustav Ahlberg](https://github.com/Gyran)
@@ -15,7 +29,7 @@
 * Adds ability to login with POST requests alongside GET, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb)
 * Adds ability to login with email, instead of username, thanks to [Florent Vilmart](https://github.com/flovilmart)
 
-### Bug Fixes:
+#### Bug Fixes:
 * Fixes issue affecting beforeSaves and increments, thanks to [Benjamin Wilson Friedman](https://github.com/montymxb)
 
 #### Dependency Updates:
diff --git a/package.json b/package.json
index c049d8cce8..5a339cb756 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {