Mike Place
7d276bdcd2
Merge pull request #29284 from cachedout/lint_29266
...
Add logentries engine
2015-11-30 14:48:32 -07:00
Mike Place
1efaab2dd5
Fix typo in #29279
2015-11-30 13:59:47 -07:00
Justin Findlay
a5ea39132f
dev docs: add development tutorial
2015-11-30 13:11:13 -07:00
rallytime
9ba9019419
Initial commit of ESXi proxy work.
...
Update grains information to work properly
Added NTP functionality to vsphere module
Add ssh enable/disable capabilities
Allow list of host_names in ntp functions
Password update, ssh_restart, datetime management functionality added
Added enable/disable vsan and disk listing capabilities
Don't stack trace is VSAN System or VSAN Config are unset
Be able to provide a list of passwords via pillar to auth against a host
Fix bug with test.ping returning False, even though other functions work
Add ability to add blank host disks to host's vsan system
Minor bug fix for vsan_add_disks function
2015-11-30 12:42:36 -07:00
Mike Place
a6889cbdcb
Merge pull request #29228 from s0undt3ch/develop
...
Fix the `engines_dirs` config option name.
2015-11-30 12:15:25 -07:00
Jimmy Tang
bdda03c456
Add logentries engine
...
This engine is first attempt at a simple engine to send event information
to the Logentries logging service.
2015-11-30 13:58:10 +00: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
Pedro Algarvio
d6d3d94b87
Fix the engines_dirs config option name.
2015-11-26 18:31:20 +00:00
Justin Findlay
9236188867
Merge pull request #29214 from cro/ssl_verify_ssl
...
Doc for salt.utils.http should say verify_ssl not ssl_verify.
2015-11-25 16:55:38 -07:00
C. R. Oldham
e9c13c561b
Doc bug--salt.utils.http takes verify_ssl not ssl_verify.
2015-11-25 15:57:31 -07:00
Trevor Hammond
48e0edd0d2
Fixes #29187 - using winrm on EC2
2015-11-25 18:36:45 +00:00
Jorge Schrauwen
ed95e84b2b
generate docs for fmadm module
2015-11-25 14:43:38 +00:00
Justin Findlay
212f7dd281
add 2015.8.3 release notes
2015-11-24 17:06:40 -07:00
Justin Findlay
cafbb49cb6
add note on 2015.8.2 release notes
2015-11-24 17:05:41 -07: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
Christophe Drevet-Droguet
03fe8c7885
grains_deep_merge config option documentation
2015-11-18 20:48:11 +01: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
Benjamin Drung
5f7fc5f94b
Fix typo an edditable -> editable
2015-11-04 11:06:16 +01:00
Benjamin Drung
0b768944c2
Fix typo an deamon -> daemon
2015-11-04 11:06:16 +01:00
Benjamin Drung
14d2a16f74
Fix typos of compatibility
2015-11-04 11:06:16 +01:00
Benjamin Drung
470e82f17f
Fix typo an dictionnary -> dictionary
2015-11-04 11:06:09 +01: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
Benjamin Drung
c7e7884de2
Fix typo an recieved -> received
2015-11-04 10:59:22 +01:00
Benjamin Drung
50eea287f3
Fix typo an managment -> management
2015-11-04 10:59:22 +01:00
Benjamin Drung
cb01da81c6
Fix typos of parameter
2015-11-04 10:59:22 +01:00
Benjamin Drung
45fcc7d339
Fix typo an dont -> don't
2015-11-04 10:59:22 +01:00
Benjamin Drung
3624935d32
Fix typo an other -> another
2015-11-04 10:59:22 +01:00
Benjamin Drung
d16afe2607
Fix typo sofwares -> software
2015-11-04 10:59:22 +01:00
Benjamin Drung
b9b7cbe525
Fix typo sofware -> software
2015-11-04 10:59:22 +01:00
Benjamin Drung
8edd2c1add
Fix typos of dependency
2015-11-04 10:58:40 +01:00
rallytime
a959681858
Add link to Sending a GH PR to documentation docs
2015-11-03 14:07:49 -07:00
rallytime
1c612e2772
Update contributing and documentation pages to recommend submitting against branches
...
Fixes #28272
2015-11-03 10:44:29 -07:00
rallytime
be8f650901
Punctuation.
2015-11-02 19:30:58 -06:00
rallytime
fd846822c1
Add state_auto_order defaults to True note to ordering docs
...
Fixes #28243
2015-11-02 19:29:32 -06:00
TheBigBear
2e5684a1e4
Update windows-package-manager.rst
2015-11-02 19:25:12 -06: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
Colton Myers
238411c8ce
Merge pull request #28464 from basepi/merge-forward-2015.8
...
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-02 13:18:21 -07:00
Mike Place
e31ef51053
Merge pull request #28493 from rallytime/bp-28492
...
Back-port #28492 to 2015.8
2015-11-02 10:54:09 -07:00
Justin Findlay
e618f51154
Merge pull request #28489 from TheBigBear/patch-1
...
Update windows-package-manager.rst (minor edit) adding missing single quote pairs.
2015-11-02 10:35:48 -07:00
Mike Place
d19affd44d
Merge pull request #28491 from rallytime/bp-28388
...
Back-port #28388 to 2015.8
2015-11-02 10:13:22 -07:00
Christer Edwards
ffc77259c9
Updated FreeBSD installation docs:
...
- fixed URL in description
- set https in all URLs
2015-11-02 11:31:23 -05:00
Christer Edwards
eb98869e76
Updated FreeBSD installation docs:
...
- fixed URL in description
- set https in all URLs
2015-11-02 09:26:25 -07:00
Mike Place
04585a2878
Documentation for disable_during_state_run
2015-11-02 11:00:33 -05:00
TheBigBear
90e0bf82e5
Update windows-package-manager.rst
2015-11-02 16:12:18 +01:00
Colton Myers
3286a5250f
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/topics/installation/windows.rst
doc/topics/tutorials/pillar.rst
pkg/windows/installer/Salt-Minion-Setup.nsi
salt/modules/file.py
salt/modules/schedule.py
salt/pillar/git_pillar.py
salt/states/boto_route53.py
salt/states/pkg.py
tests/integration/modules/pillar.py
2015-10-30 16:05:26 -06:00
Sam Michel
b968581eb1
Fixed nodegroup doc formatting to correctly link to pillar_opts in the master config
...
See #28453
2015-10-30 12:41:00 -07:00
Gary Waters
e70990704a
added a note to the tutorial for those that redhat so they can use the state file too.
2015-10-30 09:47:46 -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
Erik Johnson
66a647b7ae
Merge pull request #28388 from cachedout/beacon_state_disable
...
Beacon state disable
2015-10-29 10:04:48 -06:00
Mike Place
f05da32d32
Merge pull request #28387 from SaltyCharles/patch-1
...
Update index.rst
2015-10-29 08:40:14 -06:00
