From 93bfad36aff1793619af6125994a4470923d0da6 Mon Sep 17 00:00:00 2001
From: Paxton Hare <paxton@greenllama.com>
Date: Mon, 1 Dec 2014 14:22:51 -0500
Subject: [PATCH] prepping for release

---
 CHANGELOG.mdown | 12 +++++++++++-
 version.txt     |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.mdown b/CHANGELOG.mdown
index 37becb66..5975ea94 100644
--- a/CHANGELOG.mdown
+++ b/CHANGELOG.mdown
@@ -1,10 +1,20 @@
 # Roxy Changes
 This file describes changes made to Roxy per release
 
+## 1.7.1
+
+### New Features
+* [#311](https://github.com/marklogic/roxy/issues/311) Add support for configuring external security in appservers
+
+### Resolved Issues
+* [#308](https://github.com/marklogic/roxy/issues/308) bootstrap doesn't work when the server is using basic auth
+* [#305](https://github.com/marklogic/roxy/issues/305) Check Ruby Version in ml.sh bat
+* [#300](https://github.com/marklogic/roxy/issues/300) Running REST extensions with least privs when using modules from src
+
 ## 1.7
 
 ### New Features
-* [\#277](https://github.com/marklogic/roxy/issues/277) Allow using modules ref instead of database ref for webdav app servers
+* [#277](https://github.com/marklogic/roxy/issues/277) Allow using modules ref instead of database ref for webdav app servers
 * [#273](https://github.com/marklogic/roxy/issues/273) Wiping individual parts
 * [#228](https://github.com/marklogic/roxy/issues/228) Ability to provide properties (user / password) from command line
 * [#225](https://github.com/marklogic/roxy/issues/225) Added MLCP functionality
diff --git a/version.txt b/version.txt
index bd8bf882..943f9cbc 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.7.0
+1.7.1