Mitchell Hashimoto 862331fbf0 Merge branch '1.4.3' ... Conflicts: CHANGELOG.md lib/vagrant/version.rb		2014-01-02 10:16:52 -08:00
..
action	providers/virtualbox: fix package [GH-2739]	2014-01-02 10:09:05 -08:00
config	core: fix small comment typo	2013-11-27 18:56:48 -06:00
plugin	core: Vagrant.has_plugin? tries to match gem name first	2013-12-20 17:36:10 -03:00
util	core: handle EOFError when checking checksum [GH-2716]	2013-12-28 13:45:36 -07:00
action.rb	Add cleanup routine to synced folder plugin implementation	2013-12-02 11:19:09 +01:00
batch_action.rb	`--[no-]parallel` for vagrant up	2013-04-16 15:22:14 -07:00
box.rb	core: human friendly error for corrupt box metadata	2013-11-23 11:54:42 -08:00
box_collection.rb	core: correct some doc comments	2013-12-31 08:19:43 -08:00
cli.rb	core: output available commands in machine-readable	2013-11-26 19:06:33 -08:00
config.rb	core: configure version can be an int [GH-2689]	2013-12-19 08:03:15 -08:00
environment.rb	Fix plugin loading	2013-12-04 18:25:29 -03:00
errors.rb	core: More informative error if plugin.json parsing fails	2013-12-20 07:10:10 -03:00
guest.rb	core: improve guest type detection	2013-12-08 11:14:18 -08:00
hosts.rb	Move host base class to a plugin component	2012-06-27 09:26:03 -07:00
machine.rb	core: allow multiple private keys [GH-907]	2013-11-25 15:45:39 -08:00
machine_state.rb	Fix typo.	2013-05-12 16:32:15 +03:00
plugin.rb	Build the v2 interface, which is just a copy of V1 for now.	2012-11-06 20:51:03 -08:00
registry.rb	Registries support merging	2013-01-13 12:58:48 -08:00
ui.rb	core: ctrl-c no longer raises trap-context exception	2013-12-30 12:42:21 -08:00
util.rb	Remove GlobLoader from util.rb since it doesn't exist anymore	2011-11-13 13:19:16 -08:00
version.rb	v1.4.3	2014-01-02 10:16:06 -08:00