valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,705 Commits 24 Branches 182 Tags 341 MiB
d41de4ec16
Commit Graph

7817 Commits

Author SHA1 Message Date
garethgreenaway
80d258be0c Merge pull request #43775 from Ch3LL/develop_docs 
[develop] Bump latest and previous versions
 2017-10-09 10:22:27 -07:00
Nicole Thomas
7785919437 Merge pull request #43829 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-05 16:09:23 -04:00
Damian Wiest
76cd070e2d Fixed Jinja typo in faq.rst 
A closing curly brace was missing in the first block of Jinja code under the "Restart using states" section.
 2017-10-02 10:15:02 -05:00
Nicole Thomas
9f25a1c2dd Merge pull request #43503 from The-Loeki/high-out-by_id 
Additional highstate output modes; changes_id, filter_id, terse_id, full_id
 2017-10-01 10:14:26 -04:00
rallytime
a38ceab7cf
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/master.py
  - salt/utils/path.py
  - tests/unit/modules/test_state.py
 2017-09-29 11:48:33 -04:00
garethgreenaway
61280cc0c3 Merge branch 'develop' into release-note-formatting 2017-09-28 19:49:12 -07:00
Nicole Thomas
3f77571dad Merge branch 'develop' into high-out-by_id 2017-09-28 13:27:47 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6 2017-09-28 11:50:54 -04:00
Simon Dodsley
cdafbe2068
Update Oxygen Release notes with new grains and module 
Also do a final cosmetic fix to the purefa module documentation
 2017-09-28 07:26:30 -07:00
rallytime
d862a6f3f2
Fix some formatting issues on the oxygen release notes page 2017-09-28 09:52:04 -04:00
Mike Place
6a25bf4475 Merge pull request #42349 from coredumb/saltclass 
New pillar/master_tops saltclass module
 2017-09-28 14:26:45 +02:00
Ch3LL
9ba51646e0
[develop] Bump latest and previous versions 2017-09-27 12:31:20 -04:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-27 11:48:39 -04:00
Nicole Thomas
fb86935d99 Merge pull request #43761 from Ch3LL/release_2017.7.2 
Release Notes for 2017.7.2
 2017-09-27 10:34:51 -04:00
Ch3LL
caf5795856
add mac patch notes 2017-09-26 17:27:29 -04:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes 2017-09-26 17:21:24 -04:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/daemons/masterapi.py
  - salt/master.py
  - salt/runners/cache.py
 2017-09-26 16:46:43 -04:00
Erik Johnson
74379bac9c Merge pull request #43720 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-26 09:53:04 -05:00
rallytime
23bb4a5dde
Add GPG Verification section to Contributing Docs 
When we enable GPG Verification for pull request reviews, we should
make sure there is information available in our Contributing docs
about how to sign commits.
 2017-09-26 10:16:56 -04:00
Thomas S Hatch
d8f371b8b1 Merge pull request #43669 from moio/develop-limit-minion-processes 
Introduce process_count_max minion configuration parameter (develop)
 2017-09-26 05:56:11 -06:00
rallytime
babad12d83
Revise "Contributing" docs: merge-forwards/release branches explained! 
Fixes #43650

The merge-forward process needs a more prominent position and explanation
in the contributing documentation. This change attempts to explain this
process a little more fully and incorporates some changes to how we are
handling "main" release branches, "dot" release branches, and "develop"
in a more complete context with merge-forwards.
 2017-09-25 15:23:01 -04:00
Ronald van Zantvoort
a2234e45e2 Update release note docs regarding _id highstate output modes 2017-09-25 18:37:48 +02:00
Ronald van Zantvoort
bfbca748e2 highstate output: Document additional output modes 2017-09-25 18:32:52 +02:00
rallytime
281cbbe048
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cloud/clouds/libvirt.py
  - salt/daemons/masterapi.py
  - salt/modules/file.py
  - salt/modules/yumpkg.py
  - salt/states/archive.py
  - salt/states/file.py
  - salt/utils/files.py
  - salt/utils/minions.py
 2017-09-25 09:40:18 -04:00
Silvio Moioli
fd4194ade0 process_count_max: disable by default 2017-09-22 21:57:54 +02:00
Silvio Moioli
4d181ea523 process_count_max: add defaults and documentation 2017-09-22 21:57:02 +02:00
Mike Place
3a79549af4 Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex 
Bugs/43124 users regex
 2017-09-22 13:21:08 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
rallytime
fca4e5563a
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/unit/utils/test_parsers.py
 2017-09-22 09:40:03 -04:00
Mike Place
ff832ee607 Merge pull request #43673 from rallytime/bp-43652 
Back-port #43652 to 2016.11
 2017-09-21 10:37:35 -06:00
Mike Place
365cb9fba8 Merge pull request #43677 from terminalmage/runners-docs-2016.11 
Fix RST headers for runners (2016.11 branch)
 2017-09-21 10:35:56 -06:00
rallytime
bd88c375d8
Add autodoc file for new purefa execution module 2017-09-21 11:51:15 -04:00
Erik Johnson
c0a79c70a4 Fix RST headers for runners (2017.7 branch) 
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
 2017-09-21 10:27:12 -05:00
Erik Johnson
2fd88e94fa Fix RST headers for runners (2016.11 branch) 
To conform with the rest of the rst files for runner docs, they should
only contain the module name.
 2017-09-21 10:11:28 -05:00
Raymond Piller
d91c47c6f0 Salt Repo has Deb 9 and 8 2017-09-21 10:24:41 -04:00
Nicole Thomas
f66eb1c5ad Merge pull request #43588 from gtmanfred/do 
digitalocean should be one word.
 2017-09-21 09:25:38 -04:00
Nicole Thomas
f4eac59d96 Merge pull request #43652 from VertigoRay/patch-1 
Salt Repo has Deb 9 and 8
 2017-09-21 09:19:27 -04:00
Silvio Moioli
4a35fe5019 multiprocessing minion option: documentation fixes 2017-09-21 11:30:21 +02:00
Silvio Moioli
625eabb83f multiprocessing minion option: documentation fixes 2017-09-21 10:55:52 +02:00
Raymond Piller
5f47ef721c Salt Repo has Deb 9 and 8 2017-09-20 21:41:08 -05:00
Daniel Wallace
afaf76d0ba
add release note 2017-09-19 12:50:50 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
rallytime
57b9d642c2 Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-09-18 16:40:05 -04:00
Mike Place
1a619708c1 Enhance engines docs 
Add a note about formatting to make it more clear.
 2017-09-18 13:44:44 -06:00
Mike Place
56b671e087 Merge pull request #43330 from terminalmage/issue43077 
Fix reactor regression + unify reactor config schema
 2017-09-18 10:46:10 -06:00
Dmitry Kuzmenko
14bf2dd8ff Support regex in publisher_acl. 2017-09-18 18:38:44 +03:00
Mircea Ulinic
40f36c9915 Merge branch 'develop' of github.com:saltstack/salt into napalm-beacon 2017-09-18 10:30:49 +00:00
haam3r
58f7d051c9 Issue #43479 No runners.config in 2017.7 branch 
Add extra note about needing to import the runners.config module from the develop branch when running on a 2017.7 release.
 2017-09-14 23:01:53 +03:00
Damon Atkins
d4981a2717 Update doco 2017-09-14 12:25:30 -04:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04:00