valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,195 Commits 24 Branches 182 Tags 341 MiB
bfb8a9212c
Commit Graph

5691 Commits

Author SHA1 Message Date
Sean Jenkins
fb6e895bf0 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-30 09:43:05 -07:00
Sean Jenkins
1d7ee7bed2 Merge remote-tracking branch 'origin/develop' into sean 2015-12-30 08:44:30 -07:00
Andrew Colin Kissa
61ca281519 fix inline documentation examples not rendering 
add missing modules to indexes
 2015-12-30 07:35:57 +02:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
 2015-12-29 15:51:12 -07:00
Mike Place
60431e342a Add documentation on debugging salt-ssh 
Closes #27835
 2015-12-29 15:22:03 -07:00
rallytime
6176f383e5 Spelling fixes 2015-12-29 11:57:18 -07:00
rallytime
83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options 
Fixes #30045
 2015-12-29 11:53:49 -07:00
Sean Jenkins
41353b7ab3 Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2015-12-29 10:22:54 -07:00
Mike Place
e915f4b591 Merge pull request #30053 from akissa/add-postgres-privileges-support 
Add postgres privileges support
 2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
8066a06191 add postgres_language state module documentation 2015-12-29 13:13:37 +02:00
Andrew Colin Kissa
d27f0cc88a add postgres_privileges ref docs 2015-12-29 13:02:56 +02:00
Jacob Hammons
a04cebd48c Remove internal APIs from rest_cherrypy docs. 
Refs #28540
 2015-12-28 15:26:16 -07:00
Jacob Hammons
32a352120a updated spm docs 2015-12-28 14:29:02 -07:00
Mike Place
9e385369b7 Merge pull request #30034 from rallytime/bp-29893 
Back-port #29893 to 2015.8
 2015-12-28 13:20:51 -07:00
Mike Place
d8e1663ef1 Merge pull request #30031 from deuscapturus/patch-6 
Update index.rst
 2015-12-28 12:39:17 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
rallytime
a257249789 Add versionadded to SSH Port docs 2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa Updated Cloud msic section. 
Added ssh_port section.
 2015-12-28 12:11:16 -07:00
Nicole Thomas
548d887510 Merge pull request #30003 from marnovdm/develop 
Adds thin provisioning support for new hard disks in VMware driver
 2015-12-28 12:08:38 -07:00
Marno van der Molen
35bd10c5ba Implement suggestions from rallytime, tries to adhere to same documentation style and fixes optional thin_provision configuration 2015-12-28 19:28:07 +01:00
Theodore Cowan
aa80bd2700 Update index.rst 
Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached.  This should be fixed btw.
 2015-12-28 10:47:40 -07:00
Thomas S Hatch
46471d83a7 Merge pull request #29999 from alprs/feature-require_without_state_type 
[WIP] requisites without explicitly providing the state module
 2015-12-28 10:30:10 -07:00
Marno
72a5f6b554 Update documentation for vmware driver 2015-12-24 18:48:19 +01:00
Andreas Lutro
03ceaf103b add documentation about omitting state modules in requisites 2015-12-24 13:07:44 +01:00
Seth House
7cc7a97b91 Clarified render step from worker pool step 2015-12-23 13:48:55 -07:00
Jonathan Ballet
e6e36372a4 doc: fix documentation link for salt.serializers 2015-12-23 10:13:16 +01:00
Seth House
75a95f5154 Add to Reactor docs to illustrate the end-goal and use with Orchestrate 2015-12-22 15:17:44 -07:00
Seth House
028f000743 Update opening Reactor paragraph for conciseness 
We're far removed from 0.11 now so the extra exposition is just noise.
 2015-12-22 13:38:33 -07:00
Jorge Schrauwen
1294a1fa5c probably a good idea to actually add salt.states.zpool 2015-12-22 19:16:18 +00:00
Jorge Schrauwen
da80dea902 try to get state.states.smartos docs go be generated 2015-12-22 19:11:46 +00:00
Jorge Schrauwen
f5333ee2f8 salt.modules.fmadm still does not have docs generated, trying again 2015-12-22 19:08:22 +00:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-12-22 08:05:49 -07:00
B M Corser
b89e9c6476 Presumably what was meant 
Otherwise it's invalid syntax
 2015-12-21 21:17:23 +00:00
Aditya Kulkarni
61a9293af9 Add info about VolumeType 2015-12-21 11:26:53 -05:00
Jonathan Ballet
5aa0e9b1e0 Fix documentation typo for pillars 2015-12-21 13:26:02 +01:00
Jonathan Ballet
f2b41d04d7 Fix rendering issues for Cherrypy netapi documentation. 2015-12-21 13:26:02 +01:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
abednarik
b7e7bf5a29 Updated Cloud msic section. 
Added ssh_port section.
 2015-12-20 10:42:58 -03:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
 2015-12-18 15:00:24 -07:00
Mike Place
7eefaac58a Merge pull request #29814 from basepi/multi-master.windows.29396 
[2015.8][Windows] Fix multi-master on windows
 2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs 
Add esxi module and state to docs build
 2015-12-18 09:20:27 -07:00
Eric Mosher
0a765de370 Add infoblox documentation 
Closes #29780
 2015-12-17 23:01:55 -05:00
Thibault Cohen
d37064951d Add k8s modules and states documentation 2015-12-17 21:44:49 -05:00
rallytime
e7c5863468 Add esxi module and state to docs build 
Also fixed some minor doc errors
 2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75 Add documentation for tcp ipc_mode and multi-master 2015-12-17 14:08:41 -07:00
Mike Place
4044f3bb93 Merge pull request #29803 from rallytime/vsphere-docs 
Add vSphere module to doc ref module tree
 2015-12-17 11:52:56 -07:00
Mike Place
5f2f128f64 Merge pull request #29804 from irtnog/fix-rhel-repo-config 
Fix a typo in the gpgkey URL
 2015-12-17 11:50:46 -07:00
rallytime
3b7f5540ec Add vSphere module to doc ref module tree 2015-12-17 10:54:28 -07:00
Mike Place
c4f226f31e Merge pull request #29773 from l2ol33rt/debian_install_docfix 
Append missing wget in debian installation guide
 2015-12-17 10:29:18 -07:00
Aditya Kulkarni
10bfcb8cb0 Add documentation about scopes (GCE) 2015-12-17 09:42:15 -07:00
Matthew X. Economou
f15a3648a4 Fix a typo in the gpgkey URL 2015-12-17 10:48:24 -05:00
Andrew Colin Kissa
b749b9faba Add Pillar SQLCipher module 
Fixes #29781
 2015-12-17 09:48:27 +02:00
Robert James Hernandez
64cb4b0540 Append missing wget in debian installation guide 2015-12-16 13:44:35 -08:00
Aditya Kulkarni
ae5fbe9046 Add documentation about scopes (GCE) 2015-12-16 15:21:51 -05:00
Mike Place
1f4810be0f Merge pull request #29729 from rallytime/fix-14634 
Further clarifications on "unless" and "onlyif" requisites.
 2015-12-16 07:45:06 -07:00
Simon A. Eugster
0ca82f27b8 Doc update on masterless mode: Move master config to minion config 2015-12-16 10:59:14 +01:00
rallytime
45b77fb288 Add note about shell truthiness vs python truthiness 2015-12-15 16:14:31 -07:00
rallytime
3bfb87c031 Spelling fixes 2015-12-15 15:45:19 -07:00
rallytime
15c466cc12 Further clarifications on "unless" and "onlyif" requisites. 
Fixes #14634

- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
 2015-12-15 15:42:56 -07:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs 
Fixes #29091
 2015-12-15 14:57:36 -07:00
jraby
296de21056 Document syslog facility format and default value 2015-12-15 14:56:13 -05:00
Mike Place
1c6e896edb Merge pull request #29655 from abednarik/disable_log_doc_update 
Added a note regarding logging configuration.
 2015-12-15 11:50:05 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
 2015-12-14 15:56:26 -07:00
Colton Myers
b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-14 15:44:21 -07:00
abednarik
bdf1824bd8 Added a note regarding logging configuration. 
Simple example on how to turn off logging.
 2015-12-14 17:26:40 -03:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes 
Fixed a couple more ESXi proxy minion bugs
 2015-12-14 11:36:28 -07:00
abednarik
221c11f7da Updated documentation for Salt Development. 
In order to install pip modules for salt development we need to make sure that python devel is installed.
Otherwise pip command will fail.
 2015-12-14 13:57:51 -03:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs 
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
 2015-12-11 16:16:25 -07:00
Mike Place
9f83ab9cfc Merge pull request #29611 from cachedout/lint_29350 
Lint 29350
 2015-12-10 16:05:10 -07:00
Colton Myers
0afa5b0d5d Add cmd_umask to roster docs 2015-12-10 14:51:43 -07:00
Colton Myers
48311d42f7 Merge pull request #29384 from Granjow/watchRequisites 
Add an example to the watch requisite.
 2015-12-10 12:12:50 -07:00
Simon A. Eugster
d32bcc7d97 Documentation: Prefer cmd.run + onchanges over cmd.wait. 
* Add information on how the watch requisite targetse other states
* Update examples in salt.states.cmd about cmd.run and cmd.wait
 2015-12-10 08:12:09 +01:00
Simon A. Eugster
39e6bd7cc5 Requisite Documentation: Explain how to target other states 2015-12-10 08:05:42 +01:00
rallytime
5a2bb260d3 Added ESXi Proxy Minion Tutorial 
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
 2015-12-09 18:00:20 -07:00
Akhter Ali
88a55475a4 Merge branch 'develop' of github.com:saltstack/salt into Typo_correction 2015-12-09 17:03:31 -05:00
Akhter Ali
abe16e0b9f Fixing typo 2015-12-09 16:48:14 -05:00
Joe Healy
b96d8ff1d9 Minor update to release notes for missing fix 
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4 Fix typo specfic -> specific 2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762 Fix typo comparsion -> comparison 2015-12-09 12:17:49 +01:00
Adrian Heine né Lang
b765bd46dc Update service manager info for Debian 
Debian Jessie switched to `systemd` as default init system.
 2015-12-09 08:49:02 +01: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
Mike Place
9bc9ca78de Merge pull request #29496 from terminalmage/remove-repoquery 
Remove dependency on repoquery from yumpkg.py
 2015-12-08 14:28:08 -07:00
Mike Place
25d3a75d8c Merge pull request #29540 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-12-08 14:27:01 -07:00
Mike Place
3ae096b7ac Merge pull request #29499 from rallytime/esxi-proxy 
Initial commit of ESXi Proxy Minion
 2015-12-08 14:10:13 -07:00
Mike Place
f77c8e7baf Merge pull request #29527 from jfindlay/2015.5 
2015.5.7 notes: add note about not being released
 2015-12-08 14:08:26 -07:00
Aditya Kulkarni
b3fdce7b75 Add docs 2015-12-08 15:58:38 -05: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
Simon A. Eugster
eb04e54b38 Compiler Ordering Docs: Use double backticks for highlighting inline code 2015-12-08 19:02:57 +01: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
Justin Findlay
917e6f850c 2015.8.2 notes: add note about not being released 2015-12-08 09:16:26 -07:00
Justin Findlay
1a8044f0c9 2015.5.7 notes: add note about not being released 2015-12-08 09:12:36 -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
Erik Johnson
2461552a06 Hide aliased function 2015-12-07 15:20:51 -06: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
Jacob Hammons
c2dc709bce Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes 2015-12-03 20:14:16 -07:00
Jacob Hammons
4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes 2015-12-03 20:02:16 -07:00
jacobhammons
ab890b632a Merge pull request #29417 from jacobhammons/repo-install-updates 
Repo install updates
 2015-12-03 19:39:41 -07:00
Jacob Hammons
d58182c5fa updated repo path for RHEL installation 2015-12-03 19:36:12 -07:00
twangboy
7bdddaca53 Fixed grammer 2015-12-03 11:18:32 -07:00
twangboy
d965d00a09 Fix #19332 
Clarified precedence of pillar values
 2015-12-03 11:15:46 -07:00
Jacob Hammons
5e54359869 Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes. 2015-12-03 10:55:32 -07:00
Mike Place
7afd522878 Merge pull request #29339 from jacksontj/develop 
Simplify TCP/IPC wire protocol
 2015-12-03 09:58:41 -07:00
Jacob Hammons
ebf72924d2 updated version numbers in documentation 2015-12-03 09:21:48 -07:00
Jacob Hammons
486935b233 updated version numbers 2015-12-03 08:21:50 -07:00
Jacob Hammons
824721ff36 updated version numbers 2015-12-03 08:20:22 -07:00
Simon A. Eugster
5d76642197 Add an example to the watch requisite. 2015-12-03 09:14:15 +01:00
Thomas Jackson
8309b69740 Simplify TCP/IPC wire protocol 
As I was working on another project, I ran into some other project doing exactly this. Our current wire protocol is effectively "len-of-thing thing", but msgpack already includes headers in the serialization--making it an iterably consumable format. This means we don't need to use/waste bytes on the wire for the len of the string (esp. since its currently a string serialization of how many bytes).

This change simplifies the wire protocol, but still maintains flexibility for changes later-- since we are effectively just msgpacking dicts across the wire.

Note: this is a backwards incompatible wire protocol change. This is only being done as TCP is considered "experimental". This will be the last and only change to the wire protocol in a backwards incompatible fashion-- as we are working towards first-class support for the next release.
 2015-12-02 09:01:58 -08: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
Justin Findlay
08ced73b13 Merge pull request #29315 from jfindlay/docs 
dev tutorial doc: fix markup errors
 2015-12-01 14:42:17 -07:00
Colton Myers
0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py
 2015-12-01 13:26:44 -07:00
Justin Findlay
e8e23dc444 dev tutorial doc: fix markup errors 2015-12-01 13:05:57 -07:00
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge 
loader uses a deep dictionary merge for the grains (core and customs)
 2015-12-01 10:33:52 -07:00
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
SaltyCharles
e36d1cebc5 Update index.rst 
fix typo's and grammar
 2015-10-28 15:43:47 -07:00
SaltyCharles
a3a9d6d8b3 Update proxmox.rst 
fix typo
 2015-10-28 15:23:57 -07:00
Joseph Hall
755f7e8485 Merge pull request #28369 from rallytime/pylint-28180 
Pylint fixes and some clean up for #28180
 2015-10-28 14:43:30 -06:00
twangboy
f65e3e5275 Updated documentation to reflect the new parameter 2015-10-27 15:56:53 -06:00
SaltyCharles
14d4de6fe8 Update index.rst 
Change released to releases for clarity.
 2015-10-27 11:02:16 -07:00
Gary Waters
b15285c0b4 adding a working example of setting pillar data on the cli 2015-10-26 14:22:38 -07:00
sdm24
02cac9d8c0 Update nodegroups.rst 
cleaned up text lines that were too long
 2015-10-26 11:31:57 -07:00
Mike Place
0188a9ba4f Documentation for disable_during_state_run 2015-10-26 12:22:33 -06:00
sdm24
b2c3307c2e Update nodegroups.rst 
fixed more formatting
 2015-10-26 11:20:34 -07:00
sdm24
e79a930f57 updated nodegroups.rst 
fixed formatting issues
 2015-10-26 11:19:48 -07:00
Sam Michel
f2a6bc94df Updated the Nodegroup docs to include how to target nodegroups in SLS Jinja 
See issue #28268
 2015-10-26 11:11:01 -07:00
Mike Place
abe3003aed Merge pull request #28204 from DSRCompany/issues/23157_rename_client_acl 
Deprecate client_acl with publisher_acl (rename)
 2015-10-26 08:04:56 -06:00
Mike Place
499ed8519b Minor grammar changes to #28271 2015-10-26 06:15:19 -06:00
Mike Place
e178af0b90 Merge pull request #28271 from gwaters/update-tutorial-documentation 
Update tutorial documentation
 2015-10-26 06:12:37 -06:00
Florian Ermisch
6d4316b0ac Correct Jinja function load_* to import_* 
Fixes #28248.
Also added a YAML example because really, who wants to write json by hand? ;)

Don't know if this is mentioned in the pillar docs but would be very useful there, too.
 2015-10-24 12:13:37 +02:00
Gary Waters
f96d39483d updated the tutorial with gravyboat's suggestions 2015-10-23 17:09:49 -07:00
Gary Waters
b1f4a2bdf4 i think i changed the wrong header, updated to fix 2015-10-23 15:45:17 -07:00
Gary Waters
846b3aece1 I found you can not run the cp.push commands until after enabling the feature in the conf, so I wanted to update the docs so others who try these commands wont bump into the same issue I had. 2015-10-23 15:34:31 -07:00
Forrest Alvarez
aa0d4d406e Fix a spelling error. 2015-10-23 14:58:19 -07:00
Forrest Alvarez
6dde4e01c0 Update the pillar tutorial to talk about nested pillar values. 2015-10-23 14:57:11 -07:00
Jeremy McMillan
aef680fd73 Documentation update for DigitalOcean create_dns_record config option 2015-10-23 16:43:12 -04:00
Mike Place
00c4c64c60 Merge pull request #28208 from jacksontj/develop 
Clearer documentation of the multiprocessing option
 2015-10-23 07:42:40 -06:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename) 
Keeping client_acl support
 2015-10-23 11:59:40 +03: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
Zach Malone
2bc17047b2 Adding double quote notes 
false and no or true and yes values need to be wrapped in double quotes (' and " together), which was not previously noted in the docs.
 2015-10-22 12:39:14 -06:00
Thomas Jackson
cfb768ac30 Clearer documentation of the multiprocessing option 2015-10-22 08:45:54 -07:00
Jacob Hammons
cfadda0c0c Added note regarding missing spm exe on Debian/Ubuntu 
Minor fixes to spm docs
 2015-10-21 22:34:45 -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
b5550fcf76 Merge pull request #28159 from plastikos/improvement-check_cmd_docs 
Improve documentation of `check_cmd`.
 2015-10-21 07:21:13 -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
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
 2015-10-20 14:47:49 -06:00
Nicole Thomas
53dd01fc24 Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change 
Add clarification to cloud profile doc about host
 2015-10-20 13:46:05 -06:00
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -06:00
Aditya Kulkarni
bc371c55cd Add clarification to cloud profile doc about host 2015-10-20 15:17:47 -04:00
Mike Place
572487073c Merge pull request #28096 from rallytime/bp-28061 
Back-port #28061 to 2015.8
 2015-10-20 10:15:34 -06:00
rallytime
458a544d83 Add OpenBSD installation documentation to 2015.5 branch 2015-10-20 09:13:28 -06:00
Antoine Jacoutot
bc9159a126 OpenBSD salt package: update list of dependencies. 2015-10-20 09:07:43 -06:00
Mike Place
830ad8b3a9 Merge pull request #28103 from ajacoutot/openbsd-doc 
OpenBSD salt package: update list of dependencies.
 2015-10-20 08:55:53 -06:00
Bogdan Radulescu
c9e8228f3c Documented import_keypair for the ec2 driver 2015-10-20 12:41:28 +00:00
C. R. Oldham
1085eeab2b Merge pull request #27922 from cro/fx2 
WIP States/Modules for managing Dell FX2 chassis via salt-proxy
 2015-10-19 17:29:21 -06:00
C. R. Oldham
3712066fc9 More docs. 2015-10-19 13:19:20 -06:00
Aditya Kulkarni
7c8f236115 Add documentation for proxy minion ssh 2015-10-19 13:30:35 -04:00
Antoine Jacoutot
4c35e8182f OpenBSD salt package: update list of dependencies. 2015-10-19 19:01:26 +02:00
Michael Vogel
cb8a72d580 Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-19 09:54:12 -06:00
Mike Place
1db6406bef Merge pull request #28013 from rallytime/bp-27891 
Back-port #27891 to 2015.8
 2015-10-19 06:57:51 -06:00
Mike Place
26b3e01dda Merge pull request #28018 from rallytime/fix-27938 
Add example to Writing Grains of how grains can be loaded twice
 2015-10-19 06:47:10 -06:00
Mike Place
ce29415c8f Merge pull request #28061 from LoveIsGrief/28060_doc_default_paths 
Fix #28060 - Default paths for test environment
 2015-10-19 06:35:22 -06:00
Miguel Angel Guillén
f4422eb04d Fix Doc in jinja template, 
In the example expr_form is using pillar instead of grain when in the doc is explained the use of a grain for the role
 2015-10-19 11:59:26 +02:00
Michael Vogel
fc8d51aa5c Fix #28060 
Correct the `pip` command. install should be getting `global-options` not `pip` itself.
 2015-10-17 18:35:18 +02:00
C. R. Oldham
4ce2f8bb11 Documentation. 2015-10-16 16:52:14 -06:00
Justin Findlay
ae92a8a1dc fix repo path in ubuntu installation documentation 
Fixes #28038.
 2015-10-16 13:29:18 -06:00
Jacob Hammons
05927bb6f0 Updated release notes with additional CVE information 2015-10-16 10:18:42 -06:00
Jacob Hammons
0d1b691549 Updated release notes with additional CVE information 2015-10-16 10:12:12 -06:00
Jacob Hammons
e4d7df8695 Updated Debian and Ubuntu repo paths with new structure for 2015.8.1 2015-10-16 09:22:48 -06:00
rallytime
c23af0d8e2 Clarify loading vs rendering the final grains data structure 2015-10-16 06:43:24 -06:00
rallytime
a4d7fb7e60 Add example to Writing Grains of how grains can be loaded twice 
Fixes #27938
 2015-10-16 06:26:59 -06:00
Domingo Kiser
4af5b5c33f introduce recurse_list pillar_source_merging_strategy 2015-10-16 05:24:40 -06:00
Jacob Hammons
2870af2ba3 added link to grains security FAQ to targeting and pillar topics. 2015-10-15 15:05:35 -06:00
Jacob Hammons
bb61c68c11 Changed current release to 5.6 and added CVE to release notes 2015-10-15 11:19:11 -06:00
Jacob Hammons
236992b2be Changed current release to 8.1 and added CVEs to release notes 2015-10-15 11:14:50 -06:00
Colton Myers
6537da77fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/grains/core.py
    salt/loader.py
    salt/minion.py
    salt/modules/dockerng.py
    salt/modules/rest_package.py
    salt/modules/ssh.py
    salt/modules/state.py
    salt/modules/timezone.py
    salt/modules/zypper.py
    salt/runners/state.py
    salt/state.py
    salt/states/virtualenv_mod.py
    salt/utils/cloud.py
 2015-10-13 17:27:48 -06:00
rallytime
13a9bc9053 Use eipalloc instead of eni in EC2 interface properties example 
Fixes #27815
 2015-10-13 14:46:01 -06:00
Mike Place
dd92b8a2e3 Merge pull request #27874 from rallytime/deprecation-docs 
Add mention of Periodic Table naming scheme to deprecation docs
 2015-10-13 08:51:45 -06:00
Domingo Kiser
a8adaa8f9e introduce recurse_list pillar_source_merging_strategy 2015-10-12 21:59:39 -07:00
C. R. Oldham
5b33df9d19 Add docs for 2015.8.2+ changes 2015-10-12 14:55:19 -06:00
rallytime
8c056ba501 Add mention of Periodic Table naming scheme to deprecation docs 2015-10-12 13:08:50 -06:00
Mike Place
2066201013 Merge pull request #26943 from richardhansen/ldap 
New ldap state module and accompanying execution module
 2015-10-12 10:59:08 -06:00
Steve Hajducko
5ff8a83009 Clarify argument usage for runners in reactors 
Clarified that positional arguments don't work in runners currently and
that you must use keyword args. Fixes #27770

Also, modified the link to point at the function the example shows,
rather than the previous example.
 2015-10-09 21:22:54 -07:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Richard Hansen
39abc94739 new ldap3 execution module 
This is an alternative to the existing ldapmod module.
 2015-10-09 17:47:56 -04: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
Justin Findlay
03400ef45b fix virtual fcn return doc indentation 
Fixes #27724.
 2015-10-07 11:49:16 -06:00
Justin Findlay
4b9128b491 Merge pull request #27732 from jacobhammons/26673 
update docs for __virtual__ and __virtualname__
 2015-10-07 11:29:31 -06:00
Jacob Hammons
75cc07cf10 noted that __virtual__ can return False and an error string 2015-10-07 09:48:46 -06:00
Jacob Hammons
234a699e41 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:51:30 -06:00
Jacob Hammons
3a52d3606b Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:42:53 -06:00
Jacob Hammons
cbecd4f553 Updated saltstack2 theme to add SaltConf16 banner 2015-10-06 17:38:49 -06:00
Jacob Hammons
117e0c2bcc Added hardening topic based on the information in Refs #27088 2015-10-06 17:36:54 -06:00
Jacob Hammons
b928e1afa8 update docs for __virtual__ and __virtualname__ 
Refs #26673
 2015-10-06 17:23:42 -06:00
Justin Findlay
6bddf80546 update __virtual__ return documentation 
Related to #26755; fixes #27116; implements part of #27643.
 2015-10-06 13:47:31 -06:00
Jacob Hammons
76dc8de71b Assorted doc bugs 
Refs #9051
Refs #13407
Refs #21475
Refs #14876
Refs #27005
 2015-10-05 17:37:13 -06:00
Jacob Hammons
1c51ce28a9 Update compound matcher docs to clarify the usage of alternate delimiters 
Refs #26604
 2015-10-05 17:29:39 -06:00
Jacob Hammons
5a3e72fc8e __ops__ to __opts__ 2015-10-05 15:00:56 -06:00
Jacob Hammons
5a9867aad1 initial engines topic, updates to windows repo docs 
Refs #23239
Refs #27520
 2015-10-05 14:22:59 -06:00
Gary Wright
84b6ee0c58 .pub as public key is what we should send to remote 2015-10-05 11:40:55 -06:00
Nicole Thomas
c70a576fe8 Merge pull request #27659 from gnubyexample/develop 
.pub as public key is what we should send to remote
 2015-10-05 11:08:20 -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
Gary Wright
00baf21176 .pub as public key is what we should send to remote 2015-10-03 23:01:19 +01:00
Stephen Medina
a9063a9745 fix typo in default pillar path 
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
 2015-10-02 16:50:28 -06:00
Stephen Medina
afcc12bc9b fix typo in default pillar path 
I am a newb and this threw me off for a bit. Wanted to make it consistent with the rest of the doc.
 2015-10-02 14:25:48 -07:00
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
Mike Place
eb59cb8d1c Merge pull request #27614 from blueyed/doc-minor 
doc: minor fixes to doc and comments
 2015-10-02 09:34:02 -06:00
Jacob Hammons
1c8b32ce26 Updated windows software repository docs 2015-10-01 22:02:01 -06:00
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02: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
Mike Place
c84a1edc1b Merge pull request #27568 from jacobhammons/man-pages-five 
regenerated man pages
 2015-10-01 09:39:37 -06:00
Justin Findlay
f2eb20f26b add autogenerated 2015.8.1 release notes 2015-09-30 22:51:36 -06:00
Jacob Hammons
ee4a3b3549 added changes list for 2015.8.1 2015-09-30 16:58:53 -06:00
Justin Findlay
4f0d55cda6 add 2015.5.6 release notes 2015-09-30 16:29:57 -06:00
Jacob Hammons
b59c03d20d regenerated man pages 2015-09-30 13:32:58 -06:00
Jacob Hammons
cc37dc1087 updated version in salt.7 2015-09-30 13:01:11 -06:00
Jacob Hammons
a9dcb23a13 regenerated man pages for 2015.8.1 2015-09-30 12:58:34 -06:00
Justin Findlay
3727d79bad edit mine doc for style and markup 2015-09-30 11:40:22 -06:00
Justin Findlay
7e037a4666 add doc motivating mine vs grains 
Fixes #27518.
 2015-09-30 11:40:22 -06:00
Mike Place
a668c3543b Merge pull request #27554 from pass-by-value/doc_sphinx_version 
Update Sphinx version number in docs
 2015-09-30 10:41:27 -06:00
Aditya Kulkarni
18868de6ea Change Sphinx version number in docs 2015-09-30 11:46:06 -04:00
Mike Place
1f7ea7c764 Merge pull request #27517 from jacobhammons/install-docs 
Updated install docs
 2015-09-30 09:19:51 -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
Colton Myers
73b90f155e Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/gce.rst
    doc/topics/windows/windows-package-manager.rst
    salt/client/ssh/state.py
    salt/cloud/clouds/ec2.py
    salt/modules/defaults.py
    salt/modules/file.py
    salt/utils/cloud.py
 2015-09-29 14:56:41 -06:00
Jacob Hammons
167fd2304e Fixed a duplicated link ID 2015-09-29 14:08:48 -06:00
Jacob Hammons
c05fa71f91 Updated install docs 
Refs #27281
Refs #27179
 2015-09-29 12:07:50 -06:00
Mike Place
931f593b51 Merge pull request #27483 from rallytime/fix-17103 
Outputters should sync to output, not outputters, on the minion.
 2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953 Merge pull request #27484 from rallytime/bp-27434-and-27470 
Back-port #27434 and #27470 to 2015.5
 2015-09-29 09:32:03 -06:00
Mike Place
5de2ee35ab Minor doc fixup. 
Language and grammar changes.
 2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87 Doc: copy key to server via ssh-copy-id 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-09-28 17:19:09 -06:00
rallytime
105528720b Outputters should sync to output, not outputters, on the minion. 
Otherwise, the loader won't pick them up.

Fixes #17103
 2015-09-28 16:53:53 -06:00
Seth House
64b54e668a Add fake pymongo version attribute for the docs 
This bypasses the following traceback when building the docs.

File "/Users/shouse/src/salt/salt/salt/returners/mongo_future_return.py", line 72, in <module>
    version = '.'.join(version.split('.')[:2])
TypeError: 'Mock' object has no attribute '__getitem__'
 2015-09-28 13:51:31 -06:00
Mike Place
a49cdab950 Minor doc fixup. 
Language and grammar changes.
 2015-09-28 13:11:58 -06:00
twangboy
a996ea46e2 Added quotes to version numbers example 
Fixes #27433
 2015-09-28 12:52:59 -06:00
ZhiFeng Hu
58ea4550ba Doc: copy key to server via ssh-copy-id 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-09-26 22:55:00 +08:00
Joseph Hall
5dd1b70475 Merge pull request #27408 from rallytime/fix-27406-for-2015.5 
Fix avail_locations function for the softlayer_hw driver in 2015.5
 2015-09-25 17:34:50 -06:00
rallytime
39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. 2015-09-25 12:54:25 -06:00
Jonathan Ballet
97e69ebb97 doc: fix state's top documentation typo 2015-09-25 12:16:48 -06:00
Jonathan Ballet
33db0c27f8 doc: fix RAET links 2015-09-25 12:16:47 -06:00
Jacob Hammons
a9fdecada1 Fix css layout Refs #27389 
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
 2015-09-25 11:25:14 -06:00
Meggie Woodfield
1c779700f6 Adding stretch label definition 2015-09-25 10:59:07 -06:00
jacobhammons
24e665335d Merge pull request #27399 from multani/fix/docs 
Various documentation fixes
 2015-09-25 09:42:52 -06:00
Jonathan Ballet
c4e7392a2b doc: fix state's top documentation typo 2015-09-25 10:36:27 +02:00
Jonathan Ballet
45aecdbffd doc: fix RAET links 2015-09-25 10:36:19 +02:00
Jonathan Ballet
79d8ff38ca doc: fixed RST markup on Salt Cloud functions 2015-09-25 10:20:53 +02:00
Jonathan Ballet
fc8a1bc349 doc: remove duplicated Salt Cloud AWS section on Termination Protection 2015-09-25 10:20:53 +02:00