Teemu Matilainen
407f8dad1e
Merge pull request #4632 from janek-warchol/patch-1
...
docs - http sharing: fix typo
2014-10-13 14:26:55 -03:00
Janek Warchoł
0c8d0e4d1a
docs - http sharing: fix typo
2014-10-13 16:03:57 +02:00
Mitchell Hashimoto
77df7a2742
Merge pull request #4625 from tmatilai/travis_bundler
...
Force compatible Bundler version in Travis
2014-10-11 09:02:08 -07:00
Teemu Matilainen
3955d533f3
Force compatible Bundler version in Travis
2014-10-11 18:52:50 +03:00
Jörn Schwarze
b2a37dae99
...missed to replace the device variable :-)
2014-10-10 22:49:45 +02:00
Jörn Schwarze
fe3a380823
First fix didn't work correctly.
...
Now, the ip address will be removed, if there (from dhcp) and re-configured with the given value.
2014-10-10 22:42:13 +02:00
Jörn Schwarze
5036326319
Adding condition for the ipadm command on static ip addresses.
...
This will enable restarting solaris 11 vagrant boxes with static ip addresses.
2014-10-10 20:09:42 +02:00
David Lundgren
8b40f2bb2d
Don't update the NFS exports file [GH-4148]
...
Wrapped the NFS export modification process with a check for when there
are not exports to be modified
2014-10-10 11:02:01 -05:00
crypt1d
ca1456ff82
initial changes for forwarding port modifications
2014-10-10 13:01:04 +02:00
Anton D
fdbf3366ce
Check whether Salt bootstrap script exists before attempting to delete it. GH-4614
2014-10-10 23:20:50 +13:00
Seth Vargo
31c77bed37
Merge pull request #4601 from davidjb/master
...
Add security note to documentation for public networks
2014-10-08 08:57:41 -07:00
David\ Beitey
9b5665c3c1
Add security note for public networks
2014-10-08 16:05:46 +10:00
Shawn Neal
220e4f23b2
Merge pull request #4209 from mwrock/smb_sync
...
adding smb sync folder implementation for windows guests addressing #3699
2014-10-07 08:19:26 -07:00
Michael Kuzmin
bdef7efb2d
Fix for ignored `config.vm.box_server_url` setting.
...
https://github.com/mitchellh/vagrant/pull/4282 introduced new setting to set alternate vagrant cloud server URLs, but it doesn't work actually.
This PR helps to process the value correctly.
2014-09-29 22:36:37 +04:00
Julien Pervillé
97341c3234
providers/docker: allow multiple links to same backend (different aliases).
2014-09-29 18:46:01 +02:00
Jack Pearkes
bddca42bcb
docs: fix typo
2014-09-26 10:50:29 -04:00
Dr. Zarkov
779e54eef5
A more reliable way to detect Ubuntu
...
The default /etc/issue might have been changed by the administrator and not contain the string 'Ubuntu' anymore.
2014-09-26 14:05:54 +02:00
Jack Pearkes
09738e082a
website: remove unneeded colon in docs
2014-09-24 09:31:54 -04:00
Eris Belew
7a73f5bd7c
Update shell provisioner for powershell to add "shell_args", saner defaults and more useful detail in logging output; Add Eclipse .project file to .gitignore IDE section
2014-09-23 12:46:25 -07:00
Mark Whelan
b22259107b
fix typos
2014-09-23 14:38:26 -04:00
Mitchell Hashimoto
6747f12951
website/docs: clarify that add_recipe order matters
2014-09-16 11:24:35 -07:00
Mitchell Hashimoto
d576daa253
Merge pull request #4509 from aspiers/fix/forwarded-typo
...
website: fix "forwared" typo
2014-09-16 08:57:02 -07:00
Adam Spiers
b5d22f490a
fix "forwared" typo
2014-09-16 17:45:31 +02:00
Fabio Rehm
4a56c39c72
website: Fix a minor typo on reseller page
2014-09-15 14:00:16 -03:00
Jack Pearkes
57afab9d25
website: add info for vmware
2014-09-15 11:53:18 -04:00
Jānis Ābele
fe16352267
Fix state.highstate run when using salt master
...
retcode-passthrough option is available only for masterless salt-call.
2014-09-07 20:03:17 +03:00
Mitchell Hashimoto
bde0e3fb2a
website/www: up version for deploy
2014-09-04 15:48:21 -07:00
Mitchell Hashimoto
c38e17cc29
v1.6.5
2014-09-04 14:21:10 -07:00
Mitchell Hashimoto
951dc934cc
providers/virtualbox: cleaner ignore DHCP
2014-09-04 14:20:03 -07:00
Mitchell Hashimoto
8655d212c3
kernel/v2: always forward SSH [GH-4437]
2014-09-04 14:19:47 -07:00
Mitchell Hashimoto
b8aaac893d
Update CHANGELOG
2014-09-04 14:13:07 -07:00
Mitchell Hashimoto
5f3f52314b
Merge pull request #4434 from simoleone/fix-nfs-with-dhcp-custom-range
...
Fix NFS when DHCP settings use a custom IP range
2014-09-04 14:12:41 -07:00
Mitchell Hashimoto
2fb532d175
Update CHANGELOG
2014-09-04 14:10:37 -07:00
Mitchell Hashimoto
18ad1b9baf
Merge pull request #4462 from andytson/feature/redhat-flavour-fix
...
guests/redhat: Fix failure to detect RHEL 7 flavours
2014-09-04 14:06:32 -07:00
Andy Thompson
e667bcb675
Fix failure to detect RHEL 7 flavours
2014-09-04 22:03:07 +01:00
Mitchell Hashimoto
f239638dde
Merge pull request #4461 from andytson/feature/redhat-network-file-traversal-fix
...
guests/redhat: Fixes #4450 , add another expand_path ../ to get back to the guests directory
2014-09-04 13:43:30 -07:00
Andy Thompson
5c988b64b5
Fixes #4450 , add another expand_path ../ to get back to the guests directory
2014-09-04 20:51:10 +01:00
Mitchell Hashimoto
7936994537
Merge pull request #4454 from npvisual/master
...
Fix for issue #4452 : undefined stdout in communicator.rb
2014-09-03 19:44:46 -07:00
Nicolas Philippe
1bb61fb3f9
Fix for issue #4452 : undefined stdout in communicator.rb
...
Fixes #4452 .
The stdout variable was changed during commit
https://github.com/mitchellh/vagrant/commit/138aa5aad375ac0c076a0e0a3493
e25906ce0434 . This commit just corrects this omission.
2014-09-03 20:47:46 -05:00
Mitchell Hashimoto
03775b114a
website/www: update vmware copy to note version supported
2014-09-03 09:54:16 -07:00
Mitchell Hashimoto
11181af37b
Merge pull request #4445 from igas/patch-1
...
website/docs: add guard for provisioning script in getting-started
2014-09-03 09:14:39 -07:00
Mitchell Hashimoto
92b83eaae3
Merge pull request #4446 from andytson/feature/rhel-networks-fix
...
guests/redhat: Fixes #4438 typo missing sending networks param for rhel guest network
2014-09-03 09:13:22 -07:00
Andy Thompson
fb1d4adf87
Fixes #4438 typo missing sending networks param for rhel guest network
2014-09-03 16:09:30 +01:00
Igor Kapkov
032f3b05a2
add guard for provisioning script in getting-started
2014-09-03 22:08:57 +08:00
Mitchell Hashimoto
4c7eeb7595
Merge pull request #4443 from keithchambers/master
...
guests/redhat: hostnamectl vs. homenamectl
2014-09-02 23:10:36 -07:00
keithchambers
1f93582131
Fixed typo: hostnamectl vs. homenamectl
2014-09-02 21:55:33 -07:00
Simo Leone
71119590e8
Fix NFS when DHCP settings use a custom IP range
...
Only use the static IP if it is indeed a static IP. Otherwise assume
it's DHCP and get the IP that way.
2014-09-02 13:17:30 -07:00
Mitchell Hashimoto
2fea07f92d
v1.6.4
2014-09-02 11:47:21 -07:00
Mitchell Hashimoto
1421163a18
Merge pull request #4431 from purpleidea/bug/remove-upgrade
...
guests/redhat: remove erroneous yum upgrade.
2014-09-02 09:49:44 -07:00
James Shubin
4763506b89
Remove erroneous yum upgrade.
...
This upgrade shouldn't be part of the docker setup process. If an
upgrade is needed, it should be done independently of the docker setup.
Do it to your base image, or if needed, as a shell provisioner step.
2014-09-02 12:44:46 -04:00