From 52bb68ba731e167e98917e23e4a2ce32e2bd9500 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 1 May 2014 10:03:49 -0700
Subject: [PATCH] core: Fix some tests, revert a change

---
 lib/vagrant/plugin/v2/plugin.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/vagrant/plugin/v2/plugin.rb b/lib/vagrant/plugin/v2/plugin.rb
index e9559da6d..9a7f6177d 100644
--- a/lib/vagrant/plugin/v2/plugin.rb
+++ b/lib/vagrant/plugin/v2/plugin.rb
@@ -185,7 +185,8 @@ module Vagrant
         # Registers additional providers to be available.
         #
         # @param [Symbol] name Name of the provider.
-        def self.provider(name=UNSET_VALUE, **options, &block)
+        def self.provider(name=UNSET_VALUE, options=nil, &block)
+          options ||= {}
           options[:priority] ||= 5
 
           components.providers.register(name.to_sym) do