valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
64,031 Commits 24 Branches 182 Tags 341 MiB
f476c75fad
Commit Graph

5401 Commits

Author SHA1 Message Date
Colton Myers
f476c75fad Merge pull request #30062 from seanjnkns/develop 
Remove recurse_list from pillar_source_merging_strategy and add pilla…
 2016-01-06 10:27:35 -07:00
Sean Jenkins
8fc656b6f2 Set (pillar_)merge_lists to default for PR#30062 2016-01-06 09:55:20 -07:00
Colton Myers
7f8e666b8c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/states/user.py
 2016-01-06 09:30:28 -07:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
 2016-01-05 16:19:32 -07:00
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/ssh/index.rst
 2016-01-05 16:11:20 -07:00
Stanislav Blokhin
d81f6f7206 Fix typo in gpgkey URL 
Fixes following error on yum update:

Retrieving key from
https://repo.saltstack.com/yum/redhat/6/x86_64/latest/$releaseverSALTSTACK-GPG-KEY.pub

GPG key retrieval failed: [Errno 14] PYCURL ERROR 22 - "The requested
URL returned error: 404 Not Found"
 2016-01-04 16:43:19 +01:00
Jered Sutton
01dbf385ef Adding random_master to reference and updating master_shuffle. 
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
 2016-01-02 23:49:08 -06:00
Mike Place
040412b0b1 Merge pull request #30093 from zmalone/pillar-notes 
Noting that file_roots and "state tree" should both be avoided
 2015-12-30 15:40:05 -07:00
Zach Malone
cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some 
environments, the actual states show up another level down.  Adding notes about why this is undesirable.
 2015-12-30 13:10:46 -07:00
Mike Place
8c29e2dd6a Document that gitfs needs recent libs 
Closes #29921
 2015-12-30 12:00:33 -07:00
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