From 51d576e50d9dfd452c98bae3b5c2ba665a9233e8 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Mon, 20 Sep 2010 08:55:13 -0600
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md      | 2 ++
 config/default.rb | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d3b4abc0..3fe4adcce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 0.6.0 (unreleased)
 
+  - VM name now defaults to the name of the containing folder, plus a timestamp.
+    This should make it easier to identify VMs in the VirtualBox GUI.
   - Exposed Vagrant test helpers in `Vagrant::TestHelpers` for plugins to easily
     test themselves against Vagrant environments.
   - **Plugins** have landed. Plugins are simply gems which have a `vagrant_init.rb`
diff --git a/config/default.rb b/config/default.rb
index 9bf24c182..6d713476a 100644
--- a/config/default.rb
+++ b/config/default.rb
@@ -27,6 +27,7 @@ Vagrant::Config.run do |config|
   config.vm.system = :linux
 
   config.vm.customize do |vm|
+    # Make VM name the name of the containing folder by default
     vm.name = File.basename(File.expand_path("../", Vagrant.source_root)) + "_#{Time.now.to_i}"
   end