Commit Graph

7579 Commits

Author SHA1 Message Date
Mitchell Hashimoto 4c486259f2 Merge pull request #4881 from dharmab/docs-clarify-docker-link
Documentation: Clarify usage of docker.link()
2014-12-11 17:25:32 -08:00
Mitchell Hashimoto a3abdadc1c Update CHANGELOG 2014-12-11 17:25:09 -08:00
Mitchell Hashimoto 90a12ee476 Update CHANGELOG 2014-12-11 17:25:09 -08:00
Mitchell Hashimoto e03566fd94 Merge pull request #4831 from jcollins1991/master
typo
2014-12-11 17:24:48 -08:00
Mitchell Hashimoto e212b31394 Merge pull request #4905 from mitchellh/gc-fix-docker-agent-forwarding
providers/docker: fix support of agent forwarding
2014-12-11 17:21:59 -08:00
Mitchell Hashimoto a3a41fe3bc Merge pull request #4906 from mitchellh/gc-4071-docker-ansible
provisioners/ansible: use Docker proxy when needed
2014-12-11 17:20:41 -08:00
Seth Vargo 3387dd038c Merge pull request #4947 from joelhandwell/master
added chec_zero.html page to be shown in sidebar
2014-12-11 17:16:15 -08:00
Joel Handwell b6deb6bc28 added chec_zero page to be shown in sidebar 2014-12-11 20:08:33 -05:00
Seth Vargo 6596f7f29d Merge pull request #4937 from mitchellh/sethvargo/error_format
Use the new Rails error format
2014-12-11 16:54:45 -08:00
Seth Vargo 620d7894f3 Merge pull request #4946 from mitchellh/sethvargo/vagrantfile
Cleanup Vagrantfile
2014-12-11 16:52:54 -08:00
Seth Vargo b590ee2b3a Add push example 2014-12-11 16:50:56 -08:00
Seth Vargo 0dcdc2312b Remove editor comments from min Vagrantfile 2014-12-11 16:48:20 -08:00
Seth Vargo 6cae92a200 Cleanup generated Vagrantfile 2014-12-11 16:47:50 -08:00
Max Lincoln 3e8fdc0ca4 WinRM SSL support 2014-12-11 15:07:34 -05:00
Seth Vargo 68d82349dd Fix failing test 2014-12-11 11:15:24 -08:00
Max Lincoln 0b30dcd078 Merge branch 'winrmssl' into winrm_error_handling
Conflicts:
	test/unit/plugins/communicators/winrm/shell_test.rb
2014-12-11 14:11:06 -05:00
Max Lincoln 234adaae63 WinRM SSL support 2014-12-11 14:09:17 -05:00
Seth Vargo 61a792ac9f Merge pull request #4934 from mitchellh/sethvargo/login_token
Read ATLAS_TOKEN in vagrant-login
2014-12-11 10:45:32 -08:00
Max Lincoln b5a9477405 Fix default forwarded ports 2014-12-11 13:39:24 -05:00
Max Lincoln e7e50d39d9 Fix tests - all pass but auth retry test is extremely slow 2014-12-11 13:23:40 -05:00
Max Lincoln 24de8a1fb7 Just use ready? 2014-12-11 13:22:39 -05:00
Max Lincoln ba7b964b1e Better error handling for WinRM (using winrm v1.3.0.dev.2) 2014-12-11 13:22:39 -05:00
Max Lincoln e787291717 Use pre-release gem version w/ better errors 2014-12-11 13:22:39 -05:00
Max Lincoln 24f919c4d3 Fix accessors used by in communicator.rb 2014-12-11 13:22:39 -05:00
Max Lincoln 62ddd92768 Only forward one port for winrm 2014-12-11 13:22:39 -05:00
Max Lincoln 2caaf82ae0 Change default transport back to :plaintext, for backwards compatibility 2014-12-11 13:21:58 -05:00
Max Lincoln 02f4adc895 Fix broken variable references 2014-12-11 13:21:58 -05:00
Max Lincoln 072bb26a30 Change @ssl to @transport 2014-12-11 13:21:58 -05:00
Max Lincoln b3480049ad DRY the Shell: Don't duplicate the Config, especially since there were differing default values 2014-12-11 13:21:58 -05:00
Max Lincoln 1beb221bf3 Rename no_ssl_peer_verification to ssl_peer_verification, and make it configurable 2014-12-11 13:21:58 -05:00
Max Lincoln 2b9626f19c Use Winrm 1.2.0 and fix tests 2014-12-11 13:21:58 -05:00
Peter Ericson 243cc5dc37 config.rb: set default port based on @ssl 2014-12-11 13:20:22 -05:00
Peter Ericson 52d8fddf38 shell.rb: fix precedence 2014-12-11 13:20:22 -05:00
Peter Ericson 2f52a9c15c Add winrmssl port forward (port 5986) 2014-12-11 13:20:22 -05:00
Peter Ericson 4455d2401b Add ssl option to winrm config.rb 2014-12-11 13:19:09 -05:00
Peter Ericson a99d32f60a Add WinRM over SSL support 2014-12-11 13:19:09 -05:00
Jack Pearkes 1c328914f8 docs: link to the atlas box search page instead of homepage 2014-12-11 10:17:38 -08:00
Seth Vargo b1fde1547d Merge pull request #4939 from imjacobclark/vagrantfile-strict-mode-docs
Updates documentation to respect Vagrantfile case sensitivity on strict file systems
2014-12-11 09:44:50 -08:00
Jacob Clark 4d576ebf79 Vagrantfile is case sensitive on strict file sys 2014-12-11 14:46:35 +00:00
Seth Vargo 9a575a79ec Use the new Rails error format 2014-12-11 01:21:46 -08:00
Seth Vargo 0506e17778 Update Atlas Push to use new vagrant-login API 2014-12-10 15:11:04 -08:00
Seth Vargo 7d6a6cd263 Read the ATLAS_TOKEN in vagrant-login 2014-12-10 15:08:43 -08:00
Mitchell Hashimoto 2385305f6f core: Don't encode! since string might be frozen 2014-12-10 09:27:00 -08:00
Mitchell Hashimoto ed688ec775 Merge pull request #4929 from kalifg/master
Add back creation of mount point
2014-12-10 09:18:42 -08:00
Mitchell Hashimoto 2a285d7655 hosts/bad: escape regexp properly [GH-4922] 2014-12-10 09:16:45 -08:00
Michael Dwyer e65ae7b543 Add back creation of mount point
Accidentally removed in ad4b30dd
2014-12-10 10:56:30 -06:00
Mitchell Hashimoto ff987b19ec Make rest-client dependency looser 2014-12-09 23:20:08 -08:00
Mitchell Hashimoto ce037b6ff4 website/www: bump 2014-12-09 20:38:17 -08:00
Seth Vargo 6f535da011 Wrong version # 2014-12-09 19:55:25 -08:00
Mitchell Hashimoto ae7fc545e1 v1.7.0 2014-12-09 19:32:36 -08:00