Mitchell Hashimoto 8171471628 providers/docker: make merge logic a bit more sensible

2014-04-21 13:56:13 -07:00

..

commands

core: Use the MachineIndex#vagrant_env method

2014-04-21 13:54:31 -07:00

communicators/winrm

communicators/winrm: more tests

2014-04-21 13:51:04 -07:00

guests

Merge pull request #3102 from sax/smartos

2014-03-20 17:50:20 -07:00

kernel_v2/config

kernel/v2: boxes can be optional if a provider says so

2014-04-21 13:53:03 -07:00

providers

providers/docker: make merge logic a bit more sensible

2014-04-21 13:56:13 -07:00

provisioners

provisioners/docker: Change to VagrantPlugins::DockerProvisioner namespace

2014-04-21 13:51:30 -07:00

synced_folders

synced_folders/rsync: don't crash if comm error during rsync-auto [GH-3419]

2014-04-09 08:58:56 -07:00