From 0e9711d0dda72c669dd9fa38bbd429ddc48cde72 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 28 Aug 2013 17:17:07 -0700
Subject: [PATCH] kernel: config.vm.host_name works again

---
 CHANGELOG.md                   | 1 +
 plugins/kernel_v2/config/vm.rb | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d11c3cc10..7e5e6dcbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ FEATURES:
 IMPROVEMENTS:
 
   - core: add `--color` to any Vagrant command to FORCE color output. [GH-2027]
+  - core: "config.vm.host_name" works again, just an alias to hostname.
   - commands/plugin/install: Post install message of a plugin will be
     shown if available. [GH-1986]
   - commands/status: cosmetic improvement to better align names and
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb
index 336ee0c47..5870865a6 100644
--- a/plugins/kernel_v2/config/vm.rb
+++ b/plugins/kernel_v2/config/vm.rb
@@ -44,6 +44,12 @@ module VagrantPlugins
         @__synced_folders              = {}
       end
 
+      # This was from V1, but we just kept it here as an alias for hostname
+      # because too many people mess this up.
+      def host_name=(value)
+        @hostname = value
+      end
+
       # Custom merge method since some keys here are merged differently.
       def merge(other)
         super.tap do |result|