Chris Bednarski 723b55c049 Merge branch 'master' into b-docker-fixes ...

Conflicts:
	client/driver/docker_test.go
	client/driver/java_test.go
	client/driver/qemu_test.go

2015-09-25 18:35:23 -07:00

..

custom.html.md

website: skeleton drivers

2015-09-20 15:31:33 -07:00

docker.html.md

Added guards to tests so we can more gracefully degrade the test suite when thing are not installed

2015-09-25 16:49:26 -07:00

exec.html.md

Update website documentation on the fork/exec driver + Vagrantfile fixes

2015-09-22 18:31:13 -07:00

index.html.md

misc cleanups

2015-09-24 16:37:32 -05:00

java.html.md

Update Java docs on how Java is detected

2015-09-23 14:16:43 -05:00

qemu.html.md

Merge pull request #101 from hashicorp/f-qemu-network-update

2015-09-25 16:36:46 -07:00