saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
101183 commits 34 branches 292 tags 803 MiB
Commit graph

9135 commits

Author SHA1 Message Date
Bryce Larson
ecf0ef00b8
Fix typo in 2019.2.0 release notes 2019-03-05 13:13:24 -07:00
Ch3LL
9adc19eeb1
Merge branch '2017.7' into '2018.3' 
Conflicts:
 - doc/conf.py
 - salt/modules/zfs.py
 2019-03-05 14:08:35 -05:00
Megan Wilhite
c04b2a09f3
Merge branch '2019.2' into rn_update 2019-03-05 11:34:58 -05:00
Denys Havrysh
9ca6e503b9
Update doc/topics/releases/2019.2.0.rst 
Co-Authored-By: Ch3LL <megan.wilhite@gmail.com>
 2019-03-05 11:34:33 -05:00
Denys Havrysh
052f193f1c
add additional formatting to 2019.2.0 release notes 
Co-Authored-By: Ch3LL <megan.wilhite@gmail.com>
 2019-03-05 10:17:54 -05:00
Daniel Wozniak
92752071c4
Merge branch '2017.7' into docs-sphinx-ref-deadlink-fix 2019-03-05 03:08:36 -07:00
Daniel Wozniak
f867e6e565
Merge pull request #51761 from sdodsley/cheery_pick_fb_releasenotes 
Add new module to release notes for 2019.2.0
 2019-03-05 02:44:55 -07:00
Daniel Wozniak
a6891778ec
Merge pull request #51807 from Ch3LL/2018.3.5_rn 
Add 2018.3.5 release notes
 2019-03-05 02:27:23 -07:00
Daniel Wozniak
ff5d7d6e59
Merge pull request #51810 from Ch3LL/2019.2.1_rn 
Add 2019.2.1 release notes
 2019-03-05 02:26:46 -07:00
Ch3LL
a6ca59a1a2
Update 2019.2.0 release notes with other tojson example 2019-03-04 14:49:40 -05:00
Daniel Wallace
1e7490c458
update kubernetesmod in index.rst 2019-03-01 13:52:27 -06:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod 
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
 2019-03-01 13:33:50 -06:00
Ch3LL
072cd84c7d
Update supported python versions in installation docs 2019-03-01 14:29:50 -05:00
Ch3LL
9a681367a6
Update release documentation 2019-03-01 10:21:02 -05:00
Ch3LL
502d197f84
fix spelling error in release notes 2019-02-27 14:04:41 -05:00
Ch3LL
4d53b41740
Add new terraform salt-ssh roster feature to release notes 2019-02-27 14:00:07 -05:00
Ch3LL
aaee5fa0b7
Add 2019.2.1 release notes 2019-02-25 16:38:16 -05:00
Ch3LL
2c0b85c8f6
Add 2018.3.5 release notes 2019-02-25 16:31:34 -05:00
Megan Wilhite
27dd9fbac2
Merge pull request #51772 from Ch3LL/doc_conf_2019 
Update release versions for the 2019.2 branch
 2019-02-25 09:16:39 -05:00
Megan Wilhite
864d4be0c3
Merge pull request #51770 from Ch3LL/doc_conf_2017 
Update release versions for the 2017.7 branch
 2019-02-25 09:11:22 -05:00
Gareth J. Greenaway
186306a80c
reverting change in release notes, adding change to doc/ref/modules/all/index.rst. 2019-02-23 17:20:46 -08:00
Gareth J. Greenaway
1ef140a366
Fixing lint. 2019-02-23 15:19:19 -08:00
Gareth J. Greenaway
e37fc20e7c
Merge branch '2018.3' into merge-2018.3 
Conflicts:
  - doc/ref/modules/all/index.rst
  - salt/states/file.py
  - tests/unit/modules/test_yumpkg.py
  - tests/unit/modules/test_zypperpkg.py
  - tests/unit/states/test_file.py
 2019-02-22 16:38:15 -08:00
Alan Cugler
1f00c89fca
Added in python 3 server according to the consensus from #51748 2019-02-22 15:22:10 -06:00
Ch3LL
f28cc9bff1
[2019.2] change build_type and release in doc/conf.py 2019-02-22 15:26:16 -05:00
Ch3LL
904beb3548
[2018.3] change build_type and release in doc/conf.py 2019-02-22 15:18:33 -05:00
Ch3LL
4c670e2e62
Update release versions for the 2019.2 branch 2019-02-22 15:02:48 -05:00
Ch3LL
3efcea50f1
Update release versions for the 2018.3 branch 2019-02-22 15:01:24 -05:00
Ch3LL
25d9ca24d7
Update release versions for the 2017.7 branch 2019-02-22 14:57:22 -05:00
Alan Cugler
2330c2ac7b
makefile had an old sphinx-doc link, updated to new general front page of sphinx docs. 2019-02-22 11:31:35 -06:00
Alan Cugler
8d70e3bbb5
Replaced all bad sphinx links with ones from the new sphinx doc site. 2019-02-22 11:27:47 -06:00
Simon Dodsley
80192c80fa Add new module to release notes for 2019.2.0 2019-02-22 08:18:13 -05:00
Alan Cugler
ebdffcdc42
replaced two python sphinx deadlinks with sphinx new relevant 
documentation pages.
 2019-02-21 14:42:47 -06:00
Alan Cugler
ccf6a06c7e
Replaced a dead link for github issue tracker with another github 
link for the issue tracker and added a link to show more options
for closing issues in commit messages.
 2019-02-21 14:13:24 -06:00
Alan Cugler
bfb9d87af7 added the python3 command for startign the python http server. 2019-02-21 12:20:08 -06:00
Daniel Wallace
33bb5bfe69
fix use of virtualname 
Make sure that the virtualname is included in the actual filename of
core modules.  This will help speed up loading of modules that need to
use the virtualname, so that we hit @depends decorators less.
 2019-02-19 13:16:06 -06:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - pkg/windows/req_win.txt
  - salt/grains/core.py
 2019-02-15 15:09:36 -05:00
Daniel Wozniak
e3d5fbe947
Merge pull request #51577 from garethgreenaway/merge-2017.7 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-02-13 01:11:10 -07:00
Daniel Wozniak
5bb9b323fe
Merge pull request #51393 from garethgreenaway/various_documentation_fixes 
[2018.3] Various documentation fixes
 2019-02-12 22:34:55 -07:00
Daniel Wozniak
e060b979a4
Merge branch '2018.3' into merge-2017.7 2019-02-12 17:56:53 -07:00
Erik Johnson
24aa083c65
Merge pull request #51598 from terminalmage/add-grain-option-documentation 
Add documentation for the metadata_server_grains config option
 2019-02-12 15:23:36 -06:00
Erik Johnson
9c02104fea
Add link to metadata grain module docs 2019-02-12 09:01:19 -06:00
Erik Johnson
997ce2650c
Add documentation for the metadata_server_grains config option 2019-02-12 08:56:48 -06:00
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-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/osx/build_env.sh
	salt/utils/dns.py
	tests/integration/netapi/rest_tornado/test_app.py
	tests/support/case.py
	tests/unit/utils/test_dns.py
 2019-02-11 15:45:43 -08:00
Gareth J. Greenaway
c337fcee4c
Merge branch '2018.3' into merge-2017.7 2019-02-11 14:51:33 -08:00
Gareth J. Greenaway
e891b3f515
Merge branch '2018.3.4' into merge-2018.3.4 
Conflicts:
	tests/integration/states/test_file.py
	tests/unit/states/test_file.py
	tests/unit/utils/test_dns.py
 2019-02-11 10:46:53 -08:00
Gareth J. Greenaway
a04177518f
Merge branch '2017.7' into merge-2017.7 
Conflicts:
	salt/modules/pillar.py
	salt/states/pip_state.py
	salt/utils/data.py
	tests/unit/modules/inspectlib/test_fsdb.py
	tests/unit/output/test_json_out.py
	tests/unit/test_test_module_names.py
 2019-02-11 09:01:46 -08:00
Daniel Wozniak
8bb7535888
Merge branch '2018.3' into various_documentation_fixes 2019-02-08 11:23:24 -07:00
Frode Gundersen
c6bfe53e8b
2018.3.4 releasenotes 2019-02-06 22:29:56 +00:00
Frode Gundersen
fb678ee990
fix escaped asterisks 2019-02-06 22:08:37 +00:00