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,228 Commits 24 Branches 182 Tags 341 MiB
42cb261105
Commit Graph

5743 Commits

Author SHA1 Message Date
Nicole Thomas
8d44aa3f08 Merge pull request #32429 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-04-08 10:56:12 -06:00
rallytime
1fa7c021b3 Add pgjsonb_queue to queue doc index 2016-04-08 09:08:17 -06:00
rallytime
59b804d230 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/pkgng.py
  - salt/modules/status.py
  - salt/states/boto_asg.py
  - salt/states/boto_elb.py
 2016-04-07 16:28:59 -06:00
Justin Findlay
b27ccc424b update release candidate testing doc (#32414) 2016-04-07 09:41:46 -06:00
Erik Johnson
709410ada3 Improve git_pillar documentation/logging 
* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar
 2016-04-07 09:10:53 -06:00
Nicole Thomas
c53efc3349 Update master config docs 2016-04-07 09:10:19 -06:00
rallytime
760f479424 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cli/daemons.py
  - salt/config/__init__.py
  - salt/scripts.py
  - salt/state.py
  - tests/unit/config/config_test.py
 2016-04-05 15:09:27 -06:00
C. R. Oldham
3bbe284d89 Remove 'experimental' warning from SDB docs. 2016-04-05 09:42:34 -06:00
rallytime
d7b4b8b081 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/config.py
 2016-04-04 12:36:14 -06:00
Mike Place
9065201761 Merge pull request #32316 from vutny/update-bootstrap-tutorial 
Update Salt Bootstrap tutorial
 2016-04-04 11:18:12 -06:00
Benjamin Drung
a7db152333 Fix typo dont -> don't 2016-04-04 14:56:29 +02:00
Benjamin Drung
d4c037301b Fix typo missmatch -> mismatch 2016-04-04 14:54:54 +02:00
Benjamin Drung
0f2c779b90 Fix typo fucntion -> function 2016-04-04 14:47:12 +02:00
Benjamin Drung
301e78b5be Fix typo vaules -> values 2016-04-04 14:28:35 +02:00
Benjamin Drung
8cada9573f Fix typos of retrieve 2016-04-04 14:27:41 +02:00
Benjamin Drung
b484d6f9c9 Fix typo directorys -> directories 2016-04-04 14:20:39 +02:00
Denys Havrysh
b9698f015d Update Salt Bootstrap tutorial 2016-04-02 17:06:44 +03:00
twangboy
c971a3b054 Add documentation for disabled the winrepos 2016-04-01 14:18:31 -06:00
Andreas Lutro
1d50edd8e9 add versionadded 2016-04-01 18:18:54 +02:00
rallytime
7e642b8381 Audit config.py default types and values - first sweep 
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
 2016-03-31 13:50:51 -06:00
Andreas Lutro
7e620d5ee1 add documentation for --batch-wait 2016-03-31 19:58:11 +02:00
C. R. Oldham
7abf8becaa Documentation updates that go with PR #32252. 2016-03-31 10:41:24 -06:00
Jacob Hammons
ff8ca5ac2e Replaces incorrect reference to master_alive_check with master_alive_interval in docs 2016-03-30 20:32:43 -06:00
rallytime
fa5e17b342 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
 2016-03-30 15:33:13 -06:00
Jacob Hammons
50d1df2482 Fixes windows download paths to account for patch 2016-03-30 14:26:03 -06:00
jacobhammons
bf59f06733 Merge pull request #32217 from jacobhammons/dot8 
2015.8.8.2 release notes
 2016-03-29 11:53:22 -06:00
David Boucha
b48d0c6b5b Fix spelling error 2016-03-29 11:16:18 -06:00
Nicole Thomas
ab8b70d985 Merge pull request #32212 from rallytime/bp-32197 
Back-port #32197 to 2015.8
 2016-03-29 09:50:58 -06:00
Nicole Thomas
200d82cc3e Merge pull request #32211 from rallytime/bp-32210 
Back-port #32210 to 2015.8
 2016-03-29 09:50:42 -06:00
Todd Wells
5fdd81ace9 documentation fix issue 31844 2016-03-29 09:11:29 -06:00
Todd Wells
abd432746c documentation-fix-31931 2016-03-29 09:08:58 -06:00
Jacob Hammons
596444e2b4 2015.8.8.2 release notes 
Adds banner notifiying user when they are viewing release notes for an old release
 2016-03-29 06:38:04 -06:00
rallytime
40d09c822e Add some "best practices" information to test documentation 
Also clarifies some sections and fixes some broken links.
 2016-03-28 14:23:42 -06:00
rallytime
9adc2facb2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-03-28 10:57:25 -06:00
Mike Place
63c8bf3542 Merge pull request #32160 from cachedout/issue_31944 
Fix beacon tutorial docs
 2016-03-25 16:32:51 -06:00
Mike Place
104ada5b6f Fix beacon tutorial docs 
Closes #31944
 2016-03-25 16:31:39 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
 2016-03-25 11:47:16 -06:00
Mike Place
a09aa18036 Merge pull request #32127 from rallytime/dunder-docs 
Add runners to __salt__ docs
 2016-03-25 09:54:02 -06:00
rallytime
482690ef33 Add note to docs about __salt__ referencing runner modules 2016-03-24 16:35:50 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
 2016-03-24 15:48:00 -06:00
Jacob Hammons
21eee08842 Added known issues 32004 and 32044 to 2015.8.8 release notes 2016-03-24 13:58:21 -06:00
rallytime
a11d2e413a Add runners to __salt__ docs 2016-03-24 12:25:45 -06:00
Nicole Thomas
848ce5647f Merge pull request #32096 from rallytime/bp-32065 
Back-port #32065 to 2015.5
 2016-03-23 16:01:36 -06:00
Nicole Thomas
d5bb8f6372 Merge pull request #32098 from rallytime/bp-32083 
Back-port #32083 to 2015.8
 2016-03-23 15:49:01 -06:00
jacobhammons
9b332d48b9 Merge pull request #32104 from jacobhammons/dot10 
One additional known issue for 2015.5.10 release notes
 2016-03-23 15:20:49 -06:00
Jacob Hammons
b9fc882a1e One additional known issue for 2015.5.10 release notes 2016-03-23 15:19:36 -06:00
jacobhammons
ff51d548e1 Merge pull request #32100 from jacobhammons/dot10 
2015.5.10 release docs
 2016-03-23 14:05:21 -06:00
Jacob Hammons
544a1661ce 2015.5.10 release docs 2016-03-23 14:04:29 -06:00
Jacob Hammons
8ec5d989ad 2015.8.8 release docs 2016-03-23 14:00:30 -06:00
Thomas Güttler
4a3a6629ce "Fire Event Notifications" moved down 
it is less important. "Requisites" is what the page is about.
 2016-03-23 13:57:45 -06:00