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
64,508 Commits 24 Branches 182 Tags 341 MiB
2b7f96bf0e
Commit Graph

3201 Commits

Author SHA1 Message Date
Jacob Hammons
2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
Niels Abspoel
b55625c42a fix minor inconsistencies tampakrap suggested 2016-01-19 20:17:22 +01:00
Niels Abspoel
7ec32b2484 update suse information regarding to repositories 2016-01-16 12:16:10 +01:00
Colton Myers
19bc7b6ed4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2016-01-15 09:24:10 -07:00
Colton Myers
5b53bf2597 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/states/rabbitmq_policy.py
 2016-01-14 16:23:29 -07:00
rallytime
39b49621ad Merge branch '2015.8' into 'develop' 
Conflicts:
  - salt/beacons/service.py
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/modules/ipset.py
  - salt/modules/npm.py
  - salt/modules/rpm.py
  - salt/states/file.py
  - salt/utils/event.py
  - salt/utils/schedule.py
  - tests/unit/modules/state_test.py
 2016-01-14 13:33:53 -07:00
rallytime
df70afdaa3 Merge #30231 with updates to dependency documentation 2016-01-13 16:41:29 -07:00
C. R. Oldham
03262c432c Merge pull request #30347 from rallytime/merge-30231 
Merge #30231 with updates to dependency documentation
 2016-01-13 16:36:35 -07:00
rallytime
2beb75e49f Merge #30231 with updates to dependency documentation 2016-01-13 14:10:00 -07:00
Jacob Hammons
53d17f1f85 Changed examples to use the "example.com" domain instead of "mycompany.com" or "company.com" 2016-01-12 13:37:09 -07:00
Mike Place
2121be88e7 Merge pull request #30225 from slav0nic/patch-2 
fix salt-ssh debug doc
 2016-01-12 12:45:28 -07:00
Mike Place
7908086044 Merge pull request #30228 from dmacvicar/dmacvicar_document_schedule_once 
Document schedule `once` option
 2016-01-12 12:42:57 -07:00
Mike Place
48d2bd9e78 Merge pull request #30303 from jacobhammons/pcre-match 
Changed notes to indicate that functions are matched using regular ex…
 2016-01-12 12:15:16 -07:00
Jacob Hammons
e5079ab4c9 Changed notes to indicate that functions are matched using regular expressions instead of minions 2016-01-12 11:55:36 -07:00
Justin Findlay
22c1129f02 modules.state.sls,highstate: mock versionadded 2016-01-11 14:29:00 -07:00
Justin Findlay
934de30939 add state mock to 2015.8.4 release notes 2016-01-11 14:24:51 -07:00
Justin Findlay
741f7aba31 add 2015.5.9 release notes 2016-01-08 16:08:03 -07:00
Duncan Mac-Vicar P
e7bbcb7988 Document schedule once option 
closes #23742
 2016-01-08 11:35:44 +01:00
Sergey Maranchuk
4cce4a7c32 fix salt-ssh debug doc 
SALT_ARGV visible only in trace mode
 2016-01-08 11:33:39 +02:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
 2016-01-07 16:36:40 -07:00
Jacob Hammons
0d2111d397 Assorted doc bug fixes 
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
 2016-01-07 14:08:30 -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
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
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
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
Marno
72a5f6b554 Update documentation for vmware driver 2015-12-24 18:48:19 +01:00
Seth House
7cc7a97b91 Clarified render step from worker pool step 2015-12-23 13:48:55 -07: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
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
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