Nitin Madhok
248c090af2
Updating/reorganizing docs for VMware cloud driver
2015-11-29 18:20:26 -05:00
Jorge Schrauwen
ed95e84b2b
generate docs for fmadm module
2015-11-25 14:43:38 +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
Colton Myers
525f9fbbbb
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
2015-11-24 14:39:48 -07:00
Justin Findlay
be045f5cb1
add 2015.5.8 release notes
2015-11-23 16:21:45 -07:00
Colton Myers
233ab8a474
Merge pull request #29125 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-23 11:48:46 -07:00
Colton Myers
8d86bc3056
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/states/rabbitmq_user.py
salt/states/user.py
2015-11-23 09:53:11 -07:00
Bogdan Radulescu
4a7eee08a8
Documented import_keypair for the ec2 driver
2015-11-23 09:00:51 -07:00
Erik Johnson
139f5ba4c3
Add warning about pygit2 API instability
2015-11-20 22:34:58 -06:00
Mike Place
52e650aed9
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-20 09:23:39 -07:00
Mike Place
040d89e0ad
Merge pull request #29051 from pass-by-value/manage_salt_proxy
...
Manage salt proxy
2015-11-19 14:54:02 -07:00
Mike Place
645f687b54
Merge pull request #29055 from cachedout/style_variable_length
...
Add section to style guide
2015-11-19 12:59:46 -07:00
Mike Place
3a7e5a105b
Add section to style guide
...
A brief discussion of variable naming standards in Salt.
2015-11-19 12:01:18 -07:00
Aditya Kulkarni
4a3c8cc399
Add doc and test support
2015-11-19 12:51:45 -05:00
Jacob Hammons
b344ebfe4a
doc for salt.states.smartos
2015-11-18 17:21:57 -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
Peter Tripp
bc8c3724fd
Homebrew oneliner fix.
2015-11-17 22:30:51 -08:00
Colton Myers
d76d62877d
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
salt/modules/git.py
salt/renderers/gpg.py
salt/utils/__init__.py
2015-11-17 16:24:43 -07:00
Colton Myers
f1c80ab943
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/utils/schedule.py
2015-11-17 16:18:12 -07:00
rallytime
61029f8db1
Change 2015.8.2 release note title to reflect proper version
2015-11-16 09:44:58 -07:00
Loren Gordon
64655398b3
Fix winrepo command in windows pkg mgmt doc
2015-11-15 20:03:46 -05:00
rallytime
60e6eddb77
A couple of spelling fixes for doc conventions page.
2015-11-15 14:49:47 -07: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
Justin Findlay
1f847fc9ba
add 2015.8.2 release notes
2015-11-13 10:29:21 -07:00
Justin Findlay
648b697951
add 2015.5.7 release notes
2015-11-13 10:13:21 -07:00
Colton Myers
4b706ac76a
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/troubleshooting/master.rst
2015-11-12 12:33:27 -07:00
Colton Myers
f8b8441485
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-11-12 11:01:07 -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
jacobhammons
decc31a766
Merge pull request #28719 from jacobhammons/spm
...
removed dependencies info from docs
2015-11-09 17:04:53 -07:00
Jacob Hammons
d7017be031
removed dependencies info from docs
2015-11-09 16:07:17 -07:00
Mike Place
1874300e08
Add note about recommended umask
...
Closes #28199
2015-11-09 15:46:57 -07:00
Colton Myers
aeeaa7c90d
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/config.py
salt/minion.py
salt/pillar/s3.py
2015-11-09 12:12:24 -07:00
Thomas Jackson
f63c2d70a7
Rework minion return_retry_timer
...
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.
Cleanup of #27286
Fixes #28577
2015-11-06 18:05:45 -08: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
Nicole Thomas
572d95b3e1
Merge pull request #28596 from rallytime/merge-2015.8
...
Merge branch '2015.5' into '2015.8'
2015-11-05 07:25:09 -07:00
rallytime
eec9d69387
Merge branch '2015.5' into '2015.8'
...
Conflicts:
salt/modules/virtualenv_mod.py
salt/states/file.py
tests/integration/__init__.py
2015-11-04 15:52:59 -07:00
rallytime
d31b0d1573
Merge branch '2015.8' into develop
2015-11-04 15:40:03 -07:00
Daniel Hahler
eaf27d6ee7
doc: fix typo with salt.states.file: s/preseve/preserve/
2015-11-04 23:29:37 +01:00
Mike Place
6acf87593f
Merge pull request #28529 from rallytime/fix-28272
...
Update contributing and documentation pages to recommend submitting against branches
2015-11-04 07:47:21 -07:00
Benjamin Drung
89dcb66310
Fix the wrong "allow to do" phrase
...
"allow to do" is not a valid English phrase. Either use a gerund (allow
doing) or add a patient/object (allow someone to do).
2015-11-04 12:15:41 +01:00
Benjamin Drung
859b6b46a6
Fix typo an nonexistant -> nonexistent
2015-11-04 11:11:47 +01:00
Benjamin Drung
66921cc61e
Fix typo an succesfully -> successfully
2015-11-04 11:10:54 +01:00
Benjamin Drung
c1e3ef7c8d
Fix typo an explicitely -> explicitly
2015-11-04 11:09:20 +01:00
Benjamin Drung
029a95398c
Fix typo an superflous -> superfluous
2015-11-04 11:06:16 +01:00
Benjamin Drung
026c215933
Fix typo an unecessary -> unnecessary
2015-11-04 11:06:16 +01:00
