From cade4f8c09abbb284d408c308e38b38a8cfb76b4 Mon Sep 17 00:00:00 2001
From: James Phillips <slackpad@gmail.com>
Date: Thu, 1 Sep 2016 22:20:12 -0700
Subject: [PATCH] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 648e09dae..bc4351a10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -111,6 +111,11 @@ IMPROVEMENTS:
 * Servers will now abort bootstrapping if they detect an existing cluster with
   configured Raft peers. This will help prevent spurious leader elections when
   starting new nodes with `bootstrap_expect` enabled. [GH-2319]
+* Added a new `recursor_timeout` configuration option to set the timeout for
+  Consul's internal DNS client that's used for recursing queries to upstream DNS
+  servers. [GH-2321]
+* Added a new `-dns-port` command line option so this can be set without a config
+  file. [GH-2263]
 
 BUG FIXES: