Commit Graph

7803 Commits

Author SHA1 Message Date
Seth Vargo f06703cdb1 Stub ATLAS_TOKEN in tests
Without this stub, the tests will fail if ATLAS_TOKEN is set locally 
when running the tests.
2014-12-14 23:28:14 -05:00
Mitchell Hashimoto a4d05c8071 Update CHANGELOG.md 2014-12-13 13:31:00 -08:00
Mitchell Hashimoto 799a5d1fcb Merge pull request #4964 from silverwyrda/master
guests/arch: fix line breaks in networking
2014-12-13 13:30:17 -08:00
Douézan-Grard Guillaume 9d1834a3c9 Fix line breaks 2014-12-13 21:08:31 +01:00
Mitchell Hashimoto 6e3656ad71 Merge pull request #4961 from frodenas/heroku_typo
Heroku is a PAAS not an IAAS
2014-12-12 21:34:13 -08:00
Ferran Rodenas 032dcb1a34 Heroku is a PAAS not an IAAS 2014-12-12 19:13:12 -08:00
Mitchell Hashimoto fdd7bc3ffd commands/login: append access token to vagrantcloud => atlas URLs 2014-12-12 14:53:05 -08:00
Mitchell Hashimoto f204fa64b7 up version for dev 2014-12-12 14:48:53 -08:00
Seth Vargo 9c55180f6d Update the apt cache 2014-12-12 10:44:10 -08:00
Seth Vargo 5dfe323a2e Fix a missing colon in new Vagrantfile 2014-12-12 10:42:00 -08:00
Mitchell Hashimoto ce8513db9a website/www: typos 2014-12-12 09:44:32 -08:00
Mitchell Hashimoto 95d761b1d9 website/www: link to full push docs 2014-12-12 09:37:36 -08:00
Mitchell Hashimoto 1be7529b17 website/www: push post 2014-12-12 09:36:15 -08:00
Seth Vargo 09cc1f1d73 Merge pull request #4958 from heydonovan/named-provisioners-only-in-1.7.0
Named Provisioners only in v1.7.0
2014-12-12 09:19:53 -08:00
Donovan Hernandez 1275f24c38 Named Provisioners only in v1.7.0 2014-12-12 11:16:48 -06:00
Seth Vargo f5c6b33e8b Merge pull request #4953 from imjacobclark/adding-link-to-changelog
Adding link to changelog
2014-12-12 09:04:03 -08:00
Jacob Clark ebf941c837 mend 2014-12-12 09:56:36 +00:00
Jacob Clark c21abeec0e Adds link to version changelog in downloads page 2014-12-12 09:53:53 +00:00
Mitchell Hashimoto 84ae22e976 kernel/v2: fix push strategy config lookup 2014-12-12 01:36:39 -08:00
Mitchell Hashimoto 669c9fc013 commands/push: push strategy should be string 2014-12-12 01:27:22 -08:00
Mitchell Hashimoto b421561781 Fix push typo 2014-12-12 01:23:39 -08:00
Mitchell Hashimoto 01cfc8951c vagrant push to deploy Vagrant
/cc @sethvargo !!!
2014-12-12 00:53:50 -08:00
Mitchell Hashimoto fa7131ff6e website/www: fix Vagrantfile 2014-12-12 00:49:42 -08:00
Mitchell Hashimoto 1f98237386 v1.7.1 2014-12-11 17:35:02 -08:00
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