Mitchell Hashimoto 13b52f6b6e Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs ...

Conflicts:
	config/default.rb
	lib/vagrant/action/builtin/handle_box_url.rb
	plugins/commands/box/command/add.rb

2013-11-25 16:50:11 -08:00

..

action

Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs

2013-11-25 16:50:11 -08:00

config

Unused config objects are finalized properly [GH-1877]

2013-07-23 17:36:48 -05:00

plugin

core: output synopsis with command [GH-2249]

2013-11-23 14:00:42 -08:00

util

Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs

2013-11-25 16:50:11 -08:00

action.rb

Merge branch '2293-track-box-url' of https://github.com/fgrehm/vagrant into fgrehm-2293-track-box-url

2013-11-25 13:20:26 -08:00

batch_action.rb

--[no-]parallel for vagrant up

2013-04-16 15:22:14 -07:00

box_collection.rb

fix regression preventing boxes that specify support for multiple formats.

2013-07-26 13:16:53 -07:00

box.rb

core: human friendly error for corrupt box metadata

2013-11-23 11:54:42 -08:00

cli.rb

core: output synopsis with command [GH-2249]

2013-11-23 14:00:42 -08:00

config.rb

Get rid of unused autoload

2013-04-10 10:49:10 -07:00

environment.rb

core: allow custom callables in hooks

2013-11-24 21:07:11 -08:00

errors.rb

core: vagrant version requirements in vagrantfile [GH-2322]

2013-11-23 12:23:34 -08:00

guest.rb

core: Allow strings to be used when checking for Guest capabilities

2013-09-11 19:56:14 -03:00

hosts.rb

Move host base class to a plugin component

2012-06-27 09:26:03 -07:00

machine_state.rb

Fix typo.

2013-05-12 16:32:15 +03:00

machine.rb

core: allow multiple private keys [GH-907]

2013-11-25 15:45:39 -08: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

commands/status: add machine-readable output

2013-11-24 11:11:38 -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

Update version to 1.4.0.dev

2013-11-25 14:18:30 -02:00