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
92,812 Commits 24 Branches 182 Tags 341 MiB
58c7cd33d7
Commit Graph

8308 Commits

Author SHA1 Message Date
Erik Johnson
f89d2ccd30
Clean up Sphinx warnings 2018-06-06 08:42:21 -05:00
rallytime
3273bbdab7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/modules/all/index.rst
  - doc/topics/grains/index.rst
  - doc/topics/releases/2016.3.4.rst
  - doc/topics/spm/spm_formula.rst
  - doc/topics/tutorials/cron.rst
  - doc/topics/tutorials/index.rst
  - doc/topics/tutorials/stormpath.rst
  - salt/engines/slack.py
  - salt/log/handlers/fluent_mod.py
  - salt/modules/cyg.py
  - salt/modules/junos.py
  - salt/modules/namecheap_dns.py
  - salt/modules/namecheap_domains.py
  - salt/modules/namecheap_ns.py
  - salt/modules/namecheap_ssl.py
  - salt/modules/namecheap_users.py
  - salt/modules/reg.py
  - salt/modules/tomcat.py
  - salt/modules/vault.py
  - salt/modules/win_file.py
  - salt/modules/zpool.py
  - salt/output/highstate.py
  - salt/renderers/pass.py
  - salt/runners/cache.py
  - salt/states/boto_apigateway.py
  - salt/states/boto_iam.py
  - salt/states/boto_route53.py
  - salt/states/msteams.py
  - salt/states/reg.py
  - salt/states/win_iis.py
  - tests/integration/modules/test_cmdmod.py
  - tests/integration/states/test_user.py
  - tests/support/helpers.py
  - tests/unit/cloud/clouds/test_openstack.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/unit/modules/test_junos.py
  - tests/unit/pillar/test_git.py
  - tests/unit/states/test_win_path.py
  - tests/unit/test_pillar.py
  - tests/unit/utils/test_format_call.py
  - tests/unit/utils/test_utils.py
  - tests/unit/utils/test_warnings.py
 2018-06-01 14:54:12 -04:00
Erik Johnson
af51e16f23
Use more elegant RST syntax 2018-05-31 15:28:25 -05:00
Erik Johnson
d37f7e4f04
Add 2017.7.6 release notes 2018-05-31 15:28:25 -05:00
Erik Johnson
9dddeeefab
Improve documentation on syncing states 2018-05-31 15:28:25 -05:00
Erik Johnson
f465fa3ca7
Add best practices docs for writing states 2018-05-31 15:28:25 -05:00
Erik Johnson
93ee5ee2b0
Fix all Sphinx warnings 
Well, all but one, which we expect to see
 2018-05-31 15:28:25 -05:00
Erik Johnson
64b9b4d0b8
Clarify that name would override the id declaration 2018-05-31 15:28:24 -05:00
Nicole Thomas
0d229c6182
Merge branch '2018.3' into fix_47559 2018-05-31 11:28:30 -04:00
twangboy
9e612ec9e7
Fix markup in release notes 2018-05-30 16:10:26 -06:00
Nicole Thomas
b4bac9b41b
Merge pull request #47868 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-30 17:20:37 -04:00
rallytime
2801eecb26
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-30 11:14:40 -04:00
Ch3LL
e27ee273a7
Add == line to changelog line for release notes 2018-05-30 10:51:12 -04:00
Ch3LL
61e56d275d
Add changelog to 2018.3.1 release notes 2018-05-30 10:49:30 -04:00
Daniel Wallace
13f920415a
add tornado5 note to 2018.3.1 2018-05-29 14:01:54 -05:00
Daniel Wallace
aeacd2b749
allow tornado 5.0 to be installed only for python2 2018-05-29 14:01:18 -05:00
rallytime
dc32b67c03
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/win_snmp.py
  - tests/integration/modules/test_saltutil.py
  - tests/integration/states/test_pkg.py
  - tests/support/helpers.py
  - tests/support/runtests.py
  - tests/unit/fileserver/test_gitfs.py
  - tests/whitelist.txt
 2018-05-29 11:14:39 -04:00
Daniel Wallace
c4d828c986
Merge pull request #47850 from rallytime/swarm-autodoc 
Fix autodoc for new swarm module
 2018-05-25 20:53:16 -05:00
rallytime
467c8fa45c Fix autodoc for new swarm module 
A misspelling of "members" was causing the docs for the swarm module to
not build.

This change also fixes a bunch of formatting for RST, a handful of other
misspellings, and some small code clean-up.

The docs should be building for the swarm execution module with the
appropriate doc and CLI example formatting.
 2018-05-25 21:07:51 -04:00
Nicole Thomas
cffc9b7806
Merge branch '2017.7' into fix_46981 2018-05-24 12:52:59 -04:00
twangboy
5656183c5e
Add timezone.list, add 2018.3.2 release notes 2018-05-23 14:18:30 -06:00
twangboy
81308a4a44
Add release notes for 2017.7.7 2018-05-23 13:47:08 -06:00
rallytime
4abfd26e86
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
  - salt/fileclient.py
  - salt/output/__init__.py
  - salt/serializers/configparser.py
  - salt/states/pkg.py
  - salt/states/zpool.py
  - salt/transport/tcp.py
  - tests/integration/cloud/providers/test_ec2.py
  - tests/integration/modules/test_mac_user.py
  - tests/integration/modules/test_pip.py
  - tests/integration/modules/test_pkg.py
  - tests/integration/modules/test_service.py
  - tests/integration/states/test_pip_state.py
  - tests/integration/states/test_user.py
  - tests/unit/modules/test_cmdmod.py
 2018-05-23 12:33:00 -04:00
Nicole Thomas
0e87559ee3
Merge pull request #47781 from rallytime/update-linode-sizes 
Update cloud test profile and docs to use new Linode size lables
 2018-05-23 09:09:12 -04:00
rallytime
1adb8ea27f
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-22 17:14:31 -04:00
rallytime
a90c1b760e
Update cloud test profile and docs to use new Linode size lables 
Linode changed their size labels recently, so the cloud test profile
and the docs need to be updated accordingly.

The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`.

For example, the `Linode 2048` size is now `Linode 2GB`.
 2018-05-22 16:00:39 -04:00
rallytime
e458f4a031
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-21 10:34:10 -04:00
Ch3LL
d4aa83b92d
Add changelog to 2017.7.6 release notes 2018-05-21 10:01:00 -04:00
Gareth J. Greenaway
5d23ef4dd8
Updating Beacon topic to include list based configuration for Beacons 2018-05-19 16:29:27 -07:00
Nicole Thomas
9f926bcd1a
Merge pull request #47541 from gtmanfred/2018.3 
switch skip-roster to update-roster
 2018-05-18 09:29:49 -04:00
Nicole Thomas
cb04d9c37e
Merge pull request #47661 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-16 11:53:35 -04:00
rallytime
dd3e6f3f0a
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
  - salt/states/pkgrepo.py
 2018-05-15 12:29:29 -04:00
Nicole Thomas
3ffa412ee5
Merge branch '2018.3' into 2018.3-salt-ssh-pillar-propagation-issue-47501 2018-05-15 11:15:02 -04:00
rallytime
2827c56399
Merge branch '2018.3.1' into '2018.3' 
No conflicts.
 2018-05-14 10:57:50 -04:00
rallytime
1503f1020f
Merge branch '2017.7.6' into '2017.7' 
No conflicts.
 2018-05-14 10:56:21 -04:00
Mike Place
6d2ddd050f
One more grammar fixup 2018-05-11 11:32:33 -05:00
Mike Place
2d5ff01261
Grammar fix 2018-05-11 09:18:55 -05:00
Ch3LL
138847c9c4
Update debian install docs to reflect new latest debian releases 2018-05-11 09:51:50 -04:00
Nicole Thomas
4ec63dd041
Merge pull request #47589 from Ch3LL/watch_any_doc 
Remove duplicate file id in watch_any doc example
 2018-05-10 18:05:59 -04:00
Nicole Thomas
9836a7e62b
Merge pull request #47564 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-10 15:13:35 -04:00
Ch3LL
8cb97a48f5
Add additional state to watch_any doc example 2018-05-10 14:34:44 -04:00
Ch3LL
f7223a3bbf
Remove duplicate file id in watch_any doc example 2018-05-10 09:30:03 -04:00
rallytime
ca927fc14b
Add extra lines that are needed for proper code-block formatting 2018-05-09 16:10:31 -04:00
rallytime
ade5e9f664 [2018.3.1] Update man pages 2018-05-09 18:17:22 +00:00
rallytime
b330d763a4
Remove infoblox state autodoc file 
This state does not exist. There is an execution module named infoblox, and
several other infoblox_x state fails, but not a pure infoblox.py state module.
 2018-05-09 14:06:55 -04:00
Daniel Wallace
8c5c780292
switch skip-roster to update-roster 2018-05-09 12:51:53 -05:00
rallytime
25f03ae425
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - tests/integration/modules/test_status.py
  - tests/integration/states/test_pip_state.py
  - tests/support/case.py
  - tests/whitelist.txt
 2018-05-09 11:24:02 -04:00
Erik Johnson
806ffb298a
Add masterless mode docs to gitfs tutorial 2018-05-08 13:46:47 -05:00
Nicole Thomas
21809ddc02
Merge pull request #47514 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-08 14:36:53 -04:00
Matei Albu
2f1485e067 Option to merge current pillar with opts['pillar'] during pillar compile 
Fixes #47501
 2018-05-08 17:42:40 +02:00