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
..
box	Merge branch 'client-certs' of https://github.com/sthulb/vagrant into sthulb-client-certs	2013-11-25 16:50:11 -08:00
destroy	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
halt	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
help	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
init	commands/init: add --output flag [GH-1364]	2013-11-24 11:53:15 -08:00
package	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
plugin	commands/plugin: style nitpick	2013-11-23 16:45:45 -08:00
provision	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
reload	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
resume	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
ssh	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
ssh_config	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
status	website: document machine-readable output	2013-11-24 11:37:57 -08:00
suspend	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00
up	core: output synopsis with command [GH-2249]	2013-11-23 14:00:42 -08:00