From f2adeb0f0f659052bc29e8ad9beb5f6ee9836090 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 29 Aug 2013 16:28:43 -0700
Subject: [PATCH] Update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2dd5c6ff3..94fb2c2ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## 1.2.8 (unreleased)
 
+BACKWARDS INCOMPATIBILITY:
+
+  - `config.ssh.max_tries` is gone. Instead of maximum tries, Vagrant now
+    uses a simple overall timeout value `config.ssh.timeout` to wait for
+    the machine to boot up.
+
 FEATURES:
 
   - Mac OS X guest support. [GH-1914]