From 821bbb6f6940c6d2eba0577b550d01295c3da993 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 1 May 2012 22:33:27 -0700
Subject: [PATCH] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7cd616e64..b0705160b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,9 @@
   - Use `LogLevel QUIET` for SSH to suppress the known hosts warning. [GH-847]
   - VMs in the "guru meditation" state can be destroyed now using
     `vagrant destroy`.
+  - Fix issue where changing SSH key permissions didn't properly work. [GH-911]
+  - Disable the NAT DNS proxy when the DNS server is already proxied to
+    localhost on Linux machines. This fixes issues with 12.04. [GH-909]
 
 ## 1.0.2 (March 25, 2012)