From f44df4944cd7fcb594bfcfd95f1bd62710df3f0f Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sat, 9 Jul 2011 17:03:34 -0700 Subject: [PATCH 1/2] this translation has to be quoted. would otherwise fail on Psych: ~/.rvm/rubies/ruby-1.9.2-p180/lib/ruby/1.9.1/psych.rb:148:in `parse': couldn't parse YAML at line 162 column 21 (Psych::SyntaxError) [closes GH-411] --- templates/locales/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/locales/en.yml b/templates/locales/en.yml index 08966db1e..52478e4dd 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -159,7 +159,7 @@ en: #------------------------------------------------------------------------------- config: common: - error_empty: `%{field}` must be filled in. + error_empty: "`%{field}` must be filled in." chef: run_list_empty: "Run list must not be empty." cookbooks_path_empty: "Must specify a cookbooks path for chef solo." From 8b8225f9295f476965f770b8dccb8f425035bb8d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 12 Jul 2011 22:07:34 -0700 Subject: [PATCH 2/2] v0.7.7 - Fix crashing bug on 1.9.2 + Psych --- CHANGELOG.md | 4 ++++ lib/vagrant/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a707353a9..f06cc8e10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.7 (July 12, 2011) + + - Fix crashing bug with Psych and Ruby 1.9.2. [GH-411] + ## 0.7.6 (July 2, 2011) - Run Chef commands in a single command. [GH-390] diff --git a/lib/vagrant/version.rb b/lib/vagrant/version.rb index 1a02b9b05..74b734c3e 100644 --- a/lib/vagrant/version.rb +++ b/lib/vagrant/version.rb @@ -2,5 +2,5 @@ module Vagrant # This will always be up to date with the current version of Vagrant, # since it is used to generate the gemspec and is also the source of # the version for `vagrant -v` - VERSION = "0.7.6" + VERSION = "0.7.7" end