From b6a61d89228e5fdfe195322523fa3fe0131b27c8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 1 May 2014 09:14:27 -0700
Subject: [PATCH] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d8b69cf1..b5ee97bc9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@ BACKWARDS INCOMPATIBILITIES:
   - providers/virtualbox: Shared folders backed by VirtualBox are now
       "transient". They will be removed if you reboot outside of Vagrant.
       Always use `vagrant reload`.
+  - Deprecated: `halt_timeout` and `halt_check_interval` settings for
+      SmartOS, Solaris, and Solaris11 guests. These will be fully
+      removed in 1.7. A warning will be shown if they're in use in
+      1.6.
 
 FEATURES: