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
93,777 Commits 24 Branches 182 Tags 341 MiB
d353c02a8c
Commit Graph

8393 Commits

Author SHA1 Message Date
Ch3LL
757daf7d7e
add runas macosx warning in 2018.3.3 release notes 2018-08-07 15:49:26 -04:00
Nicole Thomas
084e7f0ef4
Merge branch '2018.3' into jid 2018-08-05 15:16:41 -04:00
Erik Johnson
7dce7cde14
Explictly document the configuration override priority 2018-08-02 11:19:22 -05:00
rallytime
436510796f
Merge branch '2017.7' into '2018.3' 
No conflicts.
 2018-07-27 11:44:07 -04:00
rallytime
5123b17ffd
Update linting docs to contain .testing.pylintrc use 
The PR tests use the ``.testing.pylintrc`` file, rather than the
more restrictive ``.pylintrc`` file. This can be a point of confusion
when following the current documentation.

The docs should reference the testing file and that the Jenkins PR
tests use ``.testing.pylintrc`` instead of ``.pylintrc``.

Fixes #48417
 2018-07-27 09:09:28 -04:00
Ch3LL
0cb4bac798
Update Saltstack Logo banner on docs.saltstack.com 2018-07-25 10:41:43 -04:00
Ch3LL
73b1fc29f0
Update Saltstack Logo banner on docs.saltstack.com 2018-07-24 16:01:49 -04:00
rallytime
dbc1f8b772
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 13:14:42 -04:00
rallytime
6df8fd8652
Update DOCBANNER with new SaltConf18 image 
And remove enterprise ad
 2018-07-24 12:44:19 -04:00
Erik Johnson
7ad832c901
Add missing release notes mention of file.blockreplace changes 
These were added to the docstrings but not to the release notes for the
releases where the change took place.
 2018-07-21 10:12:52 -05:00
Bruno Binet
32b6d22cf2 Fix RST syntax issue in doc 2018-07-20 13:57:22 +02:00
Bruno Binet
37a41226d5 Add the "traverse" jinja filter 
which can be really useful in states to select some leaf pillar data or
fallback with a default value.
 2018-07-19 17:59:30 +02:00
rallytime
29b05ffdd1
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - pkg/windows/req.txt
  - tests/integration/runners/test_state.py
  - tests/integration/states/test_file.py
  - tests/integration/states/test_npm.py
 2018-07-11 14:49:27 -04:00
rallytime
a466a4880f
Merge branch '2017.7.7' into '2017.7' 
No conflicts.
 2018-07-10 16:49:13 -04:00
Erik Johnson
56e8a1eb93
Improve the slack engine docs 
This explains the target/tgt_type options, adds some usage examples, and
makes a few other documentation tweaks.
 2018-07-07 21:41:01 -05:00
Daniel Wallace
60661b4cd0
document minions required on save_load 2018-07-06 10:01:11 -05:00
Ch3LL
3cf335b0b9
Update release versions for the 2017.7 branch 2018-07-03 09:37:58 -04:00
Ch3LL
84a1994110
Update release versions for the 2018.3 branch 2018-07-03 09:35:12 -04:00
Ch3LL
ef288f2a74
[2018.3] Remove In Progress Warning on 2017.7.7 2018-07-03 09:32:34 -04:00
Ch3LL
03ed5167fa
[2017.7] Remove In Progress Warning on 2017.7.7 2018-07-03 09:31:02 -04:00
Nicole Thomas
5b38019ca0
Merge pull request #48339 from terminalmage/backport-tojson-filter 
Backport tojson filter from #48309 to 2018.3
 2018-07-02 13:52:52 -04:00
Nicole Thomas
89857ea8b9
Merge pull request #48297 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-30 08:57:34 -04:00
rallytime
fface7cc74
Merge branch '2018.3.2' into '2018.3' 
Conflicts:
  - tests/integration/runners/test_state.py
 2018-06-28 10:05:18 -04:00
Erik Johnson
4433bec891
Add release notes for tojson jinja filter 2018-06-27 12:36:30 -05:00
Erik Johnson
ac36998801
Tweak docs to reflect backported filter 2018-06-27 12:28:34 -05:00
Erik Johnson
e34e39f0e2
Document filter deprecation 2018-06-27 12:23:29 -05:00
Megan Wilhite
5b8d55428e
Merge pull request #48323 from Ch3LL/update_version_doc_2018.3 
Update release versions for the 2018.3 branch
 2018-06-27 09:44:58 -04:00
Ch3LL
dfce1ad5ed
Remove In Progress Warning for 2018.3.2 Release 2018-06-26 17:04:11 -04:00
Ch3LL
b4548aca56
Update release versions for the 2018.3 branch 2018-06-26 15:51:53 -04:00
Ch3LL
47845ba810
Update release versions for the 2017.7 branch 2018-06-26 15:51:46 -04:00
Erik Johnson
6c33345f05
Fix typos in new mock_open docs 2018-06-25 14:05:54 -05:00
rallytime
c7bb8a50b0
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/x509.py
  - salt/runners/cloud.py
  - tests/unit/modules/test_state.py
 2018-06-25 10:41:06 -04:00
Nicole Thomas
27a0e95174
Merge pull request #48279 from terminalmage/mock_open-docs 
Add documentation/further enhancements to rewritten mock_open
 2018-06-25 09:12:29 -04:00
Erik Johnson
65c575ae9c
Fix spelling error 2018-06-24 13:27:09 -05:00
Erik Johnson
09aae0c82b
Add more examples and information on strict string types 2018-06-23 21:27:01 -05:00
Erik Johnson
8c069d105d
Add some mock_open docs 2018-06-23 15:05:18 -05:00
Nicole Thomas
67cb5563ef
Merge pull request #48252 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-06-22 11:13:41 -04:00
Nicole Thomas
731ec0a11a
Merge pull request #48037 from terminalmage/fix-custom-types-sync-docs 
Add "sync_mods" argument to state.apply/state.sls
 2018-06-21 15:57:02 -04:00
Nicole Thomas
0bae927048
Merge pull request #48249 from rallytime/2017.7.7-release-notes-update 
Update release notes for 2017.7.7
 2018-06-21 14:30:38 -04:00
Nicole Thomas
8e06471817
Merge pull request #48242 from asnell/asnell-patch-1 
Add sample list data via command line pillar
 2018-06-21 14:27:40 -04:00
rallytime
84ec655c24
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/minion.py
  - salt/modules/dockermod.py
  - salt/modules/lxc.py
  - salt/utils/__init__.py
  - tests/unit/modules/test_mount.py
 2018-06-21 14:22:15 -04:00
rallytime
19c104b6cd
Update release notes for 2018.3.2 2018-06-21 13:03:39 -04:00
rallytime
36032c8ee7
Update release notes for 2017.7.7 2018-06-21 13:02:25 -04:00
asnell
f66bf60073
Add sample list data via command line pillar 2018-06-21 08:44:14 -04:00
Nicole Thomas
1f88df6e89
Merge pull request #48210 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2018.3.1 to 2018.3
 2018-06-20 09:43:18 -04:00
Daniel Wallace
5b4897f050
Merge pull request #48186 from rallytime/saltcheck-docs 
Add autodoc module for saltcheck.py
 2018-06-19 14:03:54 -05:00
rallytime
dae65da256
Merge branch '2018.3.1' into '2018.3' 2018-06-19 14:56:06 -04:00
rallytime
da7603d879
Add autodoc module for saltcheck.py 2018-06-18 09:50:19 -04:00
Erik Johnson
c5802ad465
Fix the version number in versionadded 
2017.7.7 has already been released
 2018-06-17 21:47:33 -05:00
Erik Johnson
44c275698a
Actually it's more than just add/remove that updates the mine 2018-06-17 21:16:09 -05:00