haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,749 Commits 8 Branches 143 Tags 51 MiB
Commit Graph

5749 Commits

Author SHA1 Message Date
Mitchell Hashimoto 8172fbbd6d Merge branch 'patch-1' of https://github.com/schlamar/vagrant into schlamar-patch-1 
Conflicts:
	CHANGELOG.md
 2014-03-12 08:45:35 -07:00
Mitchell Hashimoto 0066888a87 Update CHANGELOG 2014-03-12 08:41:40 -07:00
Mitchell Hashimoto e4e845232c Merge pull request #3154 from mway/fix-osx-guest-namespace 
guests/darwin: global namespace for class IO naming conflict
 2014-03-12 08:39:21 -07:00
Marc Schlaich 5694c7dc2f providers/virtualbox: retry list vms [GH-2831] 2014-03-12 16:23:32 +01:00
Matt Way 16d093dc8a use global namespace for class IO naming conflict 2014-03-12 07:52:11 -04:00
Fuhrmann c97817fc96 Fix typo in rsync-auto docs 2014-03-11 23:56:48 -04:00
Mitchell Hashimoto 240523b1aa Update CHANGELOG 2014-03-11 11:29:03 -07:00
Mitchell Hashimoto 5863ffdf7b core: Windows paths work for box add [GH-3132] 2014-03-11 11:27:35 -07:00
Mitchell Hashimoto 8624e2cbf2 Fix failing tests on Windows 2014-03-11 11:09:37 -07:00
Mitchell Hashimoto 49471ffbf6 core: output when upgrading home path 2014-03-11 11:06:38 -07:00
Mitchell Hashimoto dabbb837fb Missing translation [GH-3130] 2014-03-11 11:01:07 -07:00
Mitchell Hashimoto eb9b85c388 core: UI#ask with no echo works even if noecho not supported [GH-3119] 2014-03-11 09:58:49 -07:00
Mitchell Hashimoto 32adbf9e58 Merge pull request #3112 from Krazylee/fix-typo 
core: fix timout typo
 2014-03-11 09:30:53 -07:00
Mitchell Hashimoto 24d8067c7b Merge pull request #3126 from bbinet/fix-salt-provisioning 
provisioners/salt: allow master key with no minion key
 2014-03-11 09:05:50 -07:00
Mitchell Hashimoto 5a3a501455 provisioners/ansible: request SSH info within provisoin [GH-3111] 2014-03-11 09:03:23 -07:00
Mitchell Hashimoto 0f70ce7e46 providers/virtualbox: style nitpick 2014-03-11 08:48:33 -07:00
Mitchell Hashimoto 2a93b6c396 core: Assume box isn't metadata if > threshold [GH-3107] 2014-03-11 08:44:05 -07:00
Bruno Binet 9625957203 Fix salt provisioning validation 
(mismatch between minion/master)
 2014-03-11 15:18:24 +01:00
krazyLee fb4cb4636e fix timout typo 2014-03-11 17:27:47 +08:00
Eric Saxby 330642fa42 Smartos guest capabilities includes rsync_pre 2014-03-11 01:25:08 -07:00
Eric Saxby 31da3860e5 Add unit tests for smartos compatibility 2014-03-10 18:52:20 -07:00
Eric Saxby edb4efa10a Dummy communicator runs :test correctly 2014-03-10 18:51:47 -07:00
Mitchell Hashimoto d0cf22dd5f Merge pull request #3097 from jjshoe/patch-1 
website/docs: Nit-picky grammer making it easier to read.
 2014-03-10 15:28:31 -07:00
jjshoe 9cdcdeb42a Nit-picky grammer making it easier to read. 2014-03-10 17:26:48 -05:00
Mitchell Hashimoto 4e3b9f3e70 website/www; simplify homepage 2014-03-10 15:14:10 -07:00
Mitchell Hashimoto 122319834c core: Setup the tmp_path before calling setup_home_path [GH-3095] 2014-03-10 15:09:09 -07:00
Mitchell Hashimoto 21aa0a21f6 Update CHANGELOG 2014-03-10 14:35:52 -07:00
Mitchell Hashimoto b6830639dd core: EINVAL is not a metadata URL 2014-03-10 14:33:30 -07:00
Mitchell Hashimoto 171b7c76d7 kernel/v1: provisioner upgrade works properly [GH-3092] 2014-03-10 13:44:24 -07:00
Jack Pearkes 06ce5661d3 website/www: 1.5 post: a very pleasant typo fix 2014-03-10 15:05:01 -04:00
Eric Saxby a0fee69d04 Add SmartOS detection and mount plugins 2014-03-10 11:52:55 -07:00
Mitchell Hashimoto df1cd25ba1 website/www: update index 2014-03-10 09:45:24 -07:00
Jack Pearkes e6087180c9 website/docs: update gemfile.lock 2014-03-10 12:41:39 -04:00
Mitchell Hashimoto 762a2324ad website/www: release blog post 2014-03-10 09:31:25 -07:00
Mitchell Hashimoto cd2171c744 Merge pull request #3090 from adamlazz/contrib-st3 
contrib: Sublime Text 3 Ruby syntax association for Vagrantfiles
 2014-03-10 08:27:54 -07:00
Adam Lazzarato e2367e1c01 Update contrib/README & bash shebang line 2014-03-10 11:18:20 -04:00
Adam Lazzarato fa6aa640f9 ST3 Vagrantfile syntax highlighting 2014-03-10 11:16:36 -04:00
Mitchell Hashimoto 9037dc358a Up version for dev 2014-03-09 22:51:31 -07:00
Mitchell Hashimoto a313d91ca2 Update CHANGELOG 2014-03-09 22:51:16 -07:00
Mitchell Hashimoto 379a3cc426 v1.5.0 2014-03-09 22:50:03 -07:00
Mitchell Hashimoto bc31abe125 More wording changes on version conflicts 2014-03-09 22:47:56 -07:00
Mitchell Hashimoto c391d2d46b Don't splat the bundler groups 2014-03-09 22:41:51 -07:00
Mitchell Hashimoto 641bfd0ee6 Clarify versionconflict error 2014-03-09 22:41:23 -07:00
Mitchell Hashimoto cf8bfe0d7f Update README 2014-03-09 21:46:01 -07:00
Mitchell Hashimoto 6a5fee0191 providers/virtualbox: add post-comm customize step [GH-3080] 2014-03-09 21:35:53 -07:00
Mitchell Hashimoto ee23b87eb6 core: Private boxes authenticate metadata box URLs too 2014-03-09 19:24:54 -07:00
Mitchell Hashimoto 06c881708d Fix tests 2014-03-09 18:29:45 -07:00
Mitchell Hashimoto 04a19e05ca synced_folders/rsync: convert to proper unix-style path [GH-3086] 2014-03-09 18:22:00 -07:00
Mitchell Hashimoto 59ae11bab3 Merge pull request #3088 from gildegoma/ansible-ssh-args 
provisioner/ansible: Improve management of ANSIBLE_SSH_ARGS
 2014-03-09 17:45:10 -07:00
Gilles Cornu 1d09fc4a79 provisioners/ansible: add new option raw_ssh_args 
Since the Ansible provisioner now potentially exports ANSIBLE_SSH_ARGS
variable, it is fair to allow to extend the content of this environment
variable (`ssh_args` parameters from ansible.cfg file have lower
priority)
 2014-03-09 22:47:24 +01:00