Aditya Kulkarni
|
61a9293af9
|
Add info about VolumeType
|
2015-12-21 11:26:53 -05:00 |
|
abednarik
|
b7e7bf5a29
|
Updated Cloud msic section.
Added ssh_port section.
|
2015-12-20 10:42:58 -03:00 |
|
Aditya Kulkarni
|
ae5fbe9046
|
Add documentation about scopes (GCE)
|
2015-12-16 15:21:51 -05:00 |
|
Colton Myers
|
7918736656
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/client/ssh/ssh_py_shim.py
salt/modules/dracr.py
salt/states/boto_vpc.py
tests/unit/states/file_test.py
|
2015-12-08 14:46:23 -07:00 |
|
Colton Myers
|
9673fd0937
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
salt/cloud/clouds/ec2.py
tests/unit/states/file_test.py
|
2015-12-08 12:23:26 -07:00 |
|
Mike Place
|
de7f3d5a59
|
Merge pull request #29504 from rallytime/fix-12072
Document userdata_file option for EC2 driver
|
2015-12-08 09:54:33 -07:00 |
|
rallytime
|
90b4823bc2
|
Switch volumes and del_*_on_destroy example ordering
Refs #29101
|
2015-12-07 19:30:23 -07:00 |
|
rallytime
|
8357c95dc2
|
Document userdata_file option for EC2 driver
Fixes #12072
|
2015-12-07 16:52:10 -07:00 |
|
abednarik
|
8e5c3e366a
|
Added Documentation note in salt cloud.
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
|
2015-12-06 13:42:18 -03:00 |
|
Colton Myers
|
3f09d58fff
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/vmware.py
salt/modules/rh_ip.py
salt/modules/s3.py
salt/modules/saltutil.py
salt/modules/zypper.py
salt/spm/__init__.py
salt/utils/aws.py
salt/utils/s3.py
tests/unit/modules/s3_test.py
tests/unit/pydsl_test.py
|
2015-12-01 15:31:03 -07:00 |
|
Nitin Madhok
|
e30587d054
|
Updating docs for VMware cloud driver
|
2015-11-29 18:28:45 -05:00 |
|
Nitin Madhok
|
4fc2986b16
|
Updating docs for VMware cloud driver
|
2015-11-29 18:24:09 -05:00 |
|
Nitin Madhok
|
248c090af2
|
Updating/reorganizing docs for VMware cloud driver
|
2015-11-29 18:20:26 -05:00 |
|
Trevor Hammond
|
48e0edd0d2
|
Fixes #29187 - using winrm on EC2
|
2015-11-25 18:36:45 +00:00 |
|
Colton Myers
|
28b40de8da
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/client/ssh/__init__.py
salt/client/ssh/ssh_py_shim.py
salt/cloud/clouds/ec2.py
salt/cloud/clouds/vmware.py
salt/grains/philips_hue.py
salt/modules/boto_ec2.py
salt/modules/boto_route53.py
salt/modules/dracr.py
salt/modules/philips_hue.py
salt/proxy/philips_hue.py
salt/states/virtualenv_mod.py
|
2015-11-24 16:07:31 -07:00 |
|
Bogdan Radulescu
|
4a7eee08a8
|
Documented import_keypair for the ec2 driver
|
2015-11-23 09:00:51 -07:00 |
|
Mathieu Le Marec - Pasquet
|
a4d197821a
|
LXC: doc
|
2015-11-18 13:34:56 +01:00 |
|
Mathieu Le Marec - Pasquet
|
43fb0eff02
|
lxc: remove useless and error prone uses_systemd knob
|
2015-11-18 13:34:53 +01:00 |
|
Colton Myers
|
efb479a1bd
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/topics/cloud/vmware.rst
salt/cloud/clouds/vmware.py
salt/grains/chronos.py
salt/grains/marathon.py
salt/loader.py
salt/modules/chronos.py
salt/modules/marathon.py
salt/proxy/chronos.py
salt/proxy/marathon.py
salt/state.py
salt/states/chronos_job.py
salt/states/marathon_app.py
salt/states/user.py
salt/utils/schedule.py
|
2015-11-13 15:18:45 -07:00 |
|
Nitin Madhok
|
9294ebd984
|
Provide ability to enable/disable customization for new VMs. Fixes #28429
|
2015-11-11 15:43:36 -05:00 |
|
Colton Myers
|
8a23181dd7
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/rabbitmq.py
salt/modules/win_system.py
salt/modules/yumpkg.py
salt/states/mount.py
|
2015-11-09 17:05:43 -07:00 |
|
rallytime
|
cded9ac01d
|
Merge branch '2015.8' into 'develop'
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
|
2015-11-06 09:34:31 -07:00 |
|
Aditya Kulkarni
|
f4c297e794
|
Make sure versionchanged is correct
|
2015-11-06 10:38:48 -05:00 |
|
Mike Place
|
35dbca24e7
|
Merge pull request #28610 from pass-by-value/lxc_config_additions
Lxc config additions
|
2015-11-05 11:43:05 -07:00 |
|
Aditya Kulkarni
|
83193641ca
|
Add doc about cloud lxc options
|
2015-11-05 12:15:30 -05:00 |
|
rallytime
|
d31b0d1573
|
Merge branch '2015.8' into develop
|
2015-11-04 15:40:03 -07:00 |
|
Benjamin Drung
|
5843c7aa24
|
Fix typo an optionnal -> optional
|
2015-11-04 10:59:22 +01:00 |
|
Benjamin Drung
|
730d0f95e7
|
Fix typo an transfered -> transferred
|
2015-11-04 10:59:22 +01:00 |
|
Colton Myers
|
32969b2408
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/topics/cloud/digitalocean.rst
salt/cloud/clouds/digital_ocean.py
salt/cloud/clouds/linode.py
salt/loader.py
salt/modules/blockdev.py
salt/modules/boto_route53.py
salt/modules/boto_vpc.py
salt/modules/bsd_shadow.py
salt/modules/file.py
salt/modules/rabbitmq.py
salt/modules/schedule.py
salt/modules/win_network.py
salt/runners/state.py
salt/spm/__init__.py
tests/unit/modules/blockdev_test.py
|
2015-11-02 18:19:01 -07:00 |
|
SaltyCharles
|
25883d5c55
|
Update proxmox.rst
fix additional typo's
|
2015-10-29 13:45:02 -06:00 |
|
rallytime
|
8e3a2ba7e7
|
Add note about azure sdk version to getting started docs
|
2015-10-29 15:30:37 -04:00 |
|
SaltyCharles
|
a3a9d6d8b3
|
Update proxmox.rst
fix typo
|
2015-10-28 15:23:57 -07:00 |
|
Jeremy McMillan
|
aef680fd73
|
Documentation update for DigitalOcean create_dns_record config option
|
2015-10-23 16:43:12 -04:00 |
|
rallytime
|
8b06ab4335
|
Add documentation to supply the ssh_username: freebsd config to DO docs
Fixes #28230
|
2015-10-22 15:24:39 -06:00 |
|
Colton Myers
|
b3f3275e0a
|
Merge pull request #28163 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
|
2015-10-21 16:46:40 -06:00 |
|
Mike Place
|
508e63237b
|
Merge pull request #28090 from Pixcell/develop
Add clone for qemu
|
2015-10-21 07:19:16 -06:00 |
|
root
|
73b8e85a96
|
Update doc
|
2015-10-21 05:45:28 -04:00 |
|
Colton Myers
|
a471832fa7
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/ec2.py
salt/config/__init__.py
salt/modules/git.py
salt/modules/hosts.py
salt/modules/htpasswd.py
salt/states/boto_secgroup.py
salt/states/htpasswd.py
tests/unit/modules/schedule_test.py
|
2015-10-20 18:13:11 -06:00 |
|
Aditya Kulkarni
|
bc371c55cd
|
Add clarification to cloud profile doc about host
|
2015-10-20 15:17:47 -04:00 |
|
Bogdan Radulescu
|
c9e8228f3c
|
Documented import_keypair for the ec2 driver
|
2015-10-20 12:41:28 +00:00 |
|
rallytime
|
13a9bc9053
|
Use eipalloc instead of eni in EC2 interface properties example
Fixes #27815
|
2015-10-13 14:46:01 -06:00 |
|
Colton Myers
|
9128e8e7ae
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/cloud/clouds/gce.py
salt/modules/daemontools.py
|
2015-10-07 13:14:28 -06:00 |
|
Colton Myers
|
69d960f8e6
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
doc/man/salt.7
doc/topics/ssh/index.rst
salt/modules/boto_secgroup.py
salt/modules/dockerng.py
salt/states/archive.py
salt/states/boto_elb.py
salt/states/boto_secgroup.py
tests/unit/modules/schedule_test.py
|
2015-10-07 13:11:48 -06:00 |
|
Colton Myers
|
35425b14ad
|
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/modules/pip.py
salt/states/user.py
|
2015-10-07 12:06:12 -06:00 |
|
avinassh
|
bfa0acfbfe
|
Fix a typo
|
2015-10-05 08:58:51 -06:00 |
|
avinassh
|
e265ba8592
|
Fix a typo
|
2015-10-05 19:21:16 +05:30 |
|
rallytime
|
1d727a545d
|
Require Network Helper over entire account
Also fixed calling some functions so they don't stacktrace.
|
2015-10-02 12:30:19 -06:00 |
|
rallytime
|
a20462b9d9
|
Allow private ips to be used with the linode driver
Alos updated the docs to include more provider/profile options and how they're used.
|
2015-10-02 12:06:05 -06:00 |
|
rallytime
|
8dc047dc18
|
If external_up is set to None, don't stacktrace, just use the private ip.
|
2015-10-01 16:37:17 -06:00 |
|
Colton Myers
|
41cad702e3
|
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
salt/minion.py
salt/modules/rest_service.py
salt/states/dockerng.py
salt/utils/cloud.py
|
2015-09-29 18:13:33 -06:00 |
|