Commit Graph

483 Commits

Author SHA1 Message Date
Bryce Larson
84f56b9895
Merge branch 'master' into 2019_2_1_port_51705 2019-10-11 13:56:02 -06:00
rallytime
4a218142a5
Remove support for RAET
Conflicts:
* doc/topics/releases/neon.rst
* requirements/tests.txt
* salt/cli/caller.py
* salt/daemons/test/__init__.py
* salt/daemons/test/test_minion.py
* salt/daemons/test/test_saltkeep.py
* salt/modules/event.py
* salt/modules/raet_publish.py
* salt/transport/__init__.py
* salt/utils/parsers.py
* setup.py
* tests/unit/modules/test_raet_publish.py
2019-10-10 09:46:39 +01:00
Gareth J. Greenaway
93b05d9d99
Porting PR #51705 to 2019.2.1 2019-09-18 17:45:06 -07:00
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2'
Conflicts:
  - salt/states/linux_acl.py
  - salt/transport/ipc.py
2019-03-28 11:10:45 -04:00
Daniel Wozniak
14a6b9d417
Merge pull request #52306 from terminal-labs/replace-ping-with-version
Replaced `test.ping` with `test.version`
2019-03-27 15:50:06 -07:00
Gareth J. Greenaway
11cd485a8b
Merge branch '2018.3' into merge-2019.2
Conflicts:
   - doc/topics/installation/freebsd.rst
2019-03-25 13:42:28 -07:00
Alan Cugler
0b1eb00dc4
Replaced test.ping with test.version
Result of issue #52277

Any where `test.ping` still exists in the docs was left
because of the context in those docs.
2019-03-25 12:09:48 -05:00
Gareth J. Greenaway
08728cf660
Merge branch '2018.3' into replace-github-dead-link 2019-03-22 11:32:15 -07:00
Alan Cugler
62e54044fc
github issue tracker link and sends you to the url for listed issues. 2019-03-18 16:18:40 -05:00
Alan Cugler
842ec84186
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix 2019-03-18 14:32:32 -05:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2'
Conflicts:
  - salt/transport/zeromq.py
  - tests/unit/modules/test_kubernetesmod.py
  - tests/unit/modules/test_win_file.py
2019-03-14 16:13:54 -04:00
Ch3LL
a16891347c
Merge branch '2018.3' into '2019.2'
Conflicts:
  - doc/conf.py
  - salt/modules/win_system.py
  - salt/states/boto3_route53.py
2019-03-05 16:00:05 -05: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
Daniel Wozniak
92752071c4
Merge branch '2017.7' into docs-sphinx-ref-deadlink-fix 2019-03-05 03:08:36 -07:00
Ch3LL
9a681367a6
Update release documentation 2019-03-01 10:21:02 -05:00
Alan Cugler
1f00c89fca
Added in python 3 server according to the consensus from #51748 2019-02-22 15:22:10 -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
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
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
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
Ch3LL
25ec653fd4
Merge branch '2018.3' into '2019.2'
Conflicts:
  - .codecov.yml
  - salt/modules/artifactory.py
2019-01-25 13:19:07 -05:00
Jamie Bliss
1945c30feb
Document the client-defined dunders 2019-01-17 15:28:59 -05:00
Jamie Bliss
6e7da9577d
Add the tokens system.
Also update the no-fs flag on the thorium system.
2019-01-17 14:56:44 -05:00
Jamie Bliss
7e2838ca92
Add reference to the execution module docs 2019-01-17 14:16:51 -05:00
Jamie Bliss
f30f9e81e7
Remove search system 2019-01-17 14:08:23 -05:00
Jamie Bliss
f0cc183823
Fileserver modules can be loaded from the fileserver. 2019-01-17 14:07:25 -05:00
Gareth J. Greenaway
f8d8bcd0d2
Fixing failing doc build tests. 2018-12-26 15:33:16 -08:00
Gareth J. Greenaway
9c04986641
Merge branch '2018.3' into merge-fluorine
Conflicts:
	doc/conf.py
	doc/topics/development/dunder_dictionaries.rst
	salt/client/ssh/ssh_py_shim.py
	salt/grains/core.py
	salt/modules/mysql.py
	salt/modules/state.py
2018-12-20 17:20:42 -08:00
Ch3LL
1f01489017
Fix external_pillars documentation 2018-12-20 11:05:43 -05:00
Benjamin Drung
b1e6080329 doc: Fix reference to salt executors
sphinx shows a warning:

doc/topics/development/modules/index.rst:133: WARNING: undefined label:
all-salt_executors (if the link has no caption the label must precede a section
header)

The executors reference is called all-salt.executors (with a dot instead of an
underscore).

Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2018-12-19 13:55:03 +01:00
Ch3LL
512293fd93
Remove dunder_dictionaries.rst. Was added to modules/developing.rst 2018-12-14 12:55:39 -05:00
Ch3LL
89b4e096db
Merge branch '2017.7' into '2018.3'
Conflicts:
  - doc/topics/development/dunder_dictionaries.rst
  - salt/grains/core.py
  - salt/netapi/rest_tornado/saltnado.py
2018-12-14 11:15:48 -05:00
Jamie Bliss
03e31688a1
whitelist_modules is linked via enable_whitelist_modules for some reason? idk 2018-12-04 04:31:47 -05:00
Jamie Bliss
5ca1f8e2a5
Typos 2018-12-04 04:20:43 -05:00
Jamie Bliss
7cb1a87fe6
Add a quick index of loader-related settings 2018-12-04 02:08:39 -05:00
Jamie Bliss
318ca48127
Make a note to not import modules 2018-12-04 01:35:27 -05:00
Jamie Bliss
678958e559
Editing 2018-11-30 19:21:54 -05:00
Jamie Bliss
374d0e9745
Finish the last sections 2018-11-30 19:14:35 -05:00
Jamie Bliss
98da110be2
Migrate Dynamic Module Distribution to Modular Systems. 2018-11-30 18:21:12 -05:00
Jamie Bliss
1bdd49d43a
Add more links and write some system summaries 2018-11-29 22:49:39 -05:00
Jamie Bliss
bd3796a9c2
Update TOC 2018-11-28 18:20:46 -05:00
Jamie Bliss
3a9ab1b5f5
Merge dunders into developing, expand to cover all dunders. 2018-11-28 17:53:14 -05:00
Jamie Bliss
d06739a647
Add short writeups for a bunch of systems. 2018-11-26 22:25:23 -05:00
Jamie Bliss
705e7e460f
Add a bunch of cross linking 2018-11-26 21:37:32 -05:00
Jamie Bliss
40f9b16530
Add missing module type sections 2018-11-26 21:22:57 -05:00
Jamie Bliss
172d8c2902
Refactor headings 2018-11-26 20:56:43 -05:00
Jamie Bliss
53154a0fe0
Oops, missed that 2018-11-26 20:43:40 -05:00
Jamie Bliss
0dcd3419af
Possible horrific use of toctrees? maybe 2018-11-26 20:02:46 -05:00