From b5cf967fba71e58abfb887aef0f89747c1ae4f59 Mon Sep 17 00:00:00 2001
From: Josh Baker <joshbaker77@gmail.com>
Date: Tue, 24 May 2016 16:03:54 -0700
Subject: [PATCH] 1.2.0

---
 CHANGELOG.md | 5 +++++
 build.sh     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f18fb03..f13c3bb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0] - 2016-05-24
+### Added
+- #17: Roaming Geofences for NEARBY command
+- #15: maxmemory config setting
+
 ## [1.1.4] - 2016-04-19
 ### Fixed
 - #12: Issue where a newline was being added to HTTP POST requests.
diff --git a/build.sh b/build.sh
index bffb9ca7..8c141ac8 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VERSION="1.1.4"
+VERSION="1.2.0"
 PROTECTED_MODE="no"
 
 # Hardcode some values to the core package