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

7834 Commits

Author SHA1 Message Date
Markus
820add5551
Added version tag 2017-10-12 20:30:55 +02:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk 2017-10-12 13:43:27 +02:00
Mike Place
24b9f21456 Merge pull request #43831 from eradman/vmm_grain 
Detect OpenBSD guest running under VMM(4)
 2017-10-11 17:19:52 -06:00
Nicole Thomas
3a078304d8 Merge pull request #43982 from terminalmage/salt.utils.data 
Move 13 functions from salt.utils to salt.utils.data
 2017-10-11 11:42:08 -04:00
garethgreenaway
f3699ade0a Merge branch 'develop' into vagrant-module 2017-10-10 17:07:20 -07:00
Erik Johnson
d947ddf176
Move 13 functions from salt.utils to salt.utils.data 
These functions are:

- salt.utils.compare_dicts
- salt.utils.compare_lists
- salt.utils.decode_dict
- salt.utils.decode_list
- salt.utils.exactly_n
- salt.utils.exactly_one
- salt.utils.traverse_dict
- salt.utils.filter_by
- salt.utils.traverse_dict_and_list
- salt.utils.subdict_match
- salt.utils.substr_in_list
- salt.utils.is_dictlist
- salt.utils.repack_dictlist
 2017-10-10 17:42:42 -05:00
Benedikt Werner
c5dde87d88
Renamed digitalocean cloud module doc file 2017-10-10 18:55:06 +02:00
Nicole Thomas
33e0353858 Merge branch 'develop' into vmm_grain 2017-10-10 09:01:33 -04:00
Mike Place
efbe49fe60 Merge branch 'develop' into vagrant-module 2017-10-09 11:43:42 -06:00
garethgreenaway
80d258be0c Merge pull request #43775 from Ch3LL/develop_docs 
[develop] Bump latest and previous versions
 2017-10-09 10:22:27 -07:00
Daniel Wallace
1f8ec5d335 Merge branch 'develop' into vagrant-module 2017-10-06 11:32:31 -06: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
garethgreenaway
37d7f13926 Merge branch 'develop' into vagrant-module 2017-10-05 10:25:24 -07:00
Eric Radman
1a9f12fd67
Detect OpenBSD guest running under VMM(4) 
grains.manufacturer is 'OpenBSD' when running under VMM
 2017-10-02 17:45:37 -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
Mike Place
952b5d8e87 Merge branch 'develop' into vagrant-module 2017-09-29 12:34:41 +02: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
vernoncole
f82ec9e72d Revert "Oxygen release notes for vagrant and saltify drivers" 
This reverts commit afbfe86
 2017-09-27 14:59:47 -06:00
vernoncole
a1a81eb906 supply Vagrant documentation 2017-09-27 14:59:47 -06:00
vernoncole
52acfd980d merge upstream develop 2017-09-27 14:26:32 -06: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