valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,214 Commits 24 Branches 182 Tags 341 MiB
00798a9e33
Commit Graph

270 Commits

Author SHA1 Message Date
Max Arnold
00798a9e33 Fix quite common Exception typos 2018-06-21 14:22:44 +07:00
Brendan Beveridge
cc85427724
add support for no_proxy for apt pkg and generic http util 2018-06-13 15:41:09 -04:00
rallytime
8d3c2be61c
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/kubernetes.py
  - salt/modules/opkg.py
  - salt/modules/useradd.py
  - salt/output/table_out.py
  - salt/states/mysql_query.py
  - salt/states/user.py
 2018-05-23 12:57:58 -04:00
plastikos
2ddd589f68
Merge branch 'develop' into improvement-spm-base_paths 2018-05-17 23:09:05 -06:00
rallytime
969296ecbe
Merge branch '2018.3' into 'develop' 
No conflicts.
 2018-05-15 12:38:01 -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
rallytime
ade5e9f664 [2018.3.1] Update man pages 2018-05-09 18:17:22 +00:00
rallytime
48ecb78dec [2017.7.6] Update man pages 2018-05-07 20:31:38 +00:00
Thayne Harbaugh
a66802c75a Various clean-ups, fixes and improvements to SPM directory references 
in the base paths used in syspaths.py.
 2018-05-04 17:41:57 -06:00
rallytime
5b50eaf6b0
Merge branch '2018.3' into 'develop' 
Conflicts:
  - doc/ref/proxy/all/salt.proxy.cimc.rst
  - doc/ref/proxy/all/salt.proxy.panos.rst
  - doc/topics/releases/2018.3.0.rst
  - salt/modules/cmdmod.py
  - salt/modules/state.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_state.py
 2018-04-05 13:25:46 -04:00
rallytime
e312efb5e7
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/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
rallytime
782a5584f5
Update man pages for 2017.7.5 2018-03-13 12:47:40 -04:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
rallytime
a731047e59
Add man pages for oxygen release 2018-02-23 12:15:13 -05:00
xy@zhihu.com
be8427fdc9 pip.list_all_versions now can read index_url 2018-02-09 17:46:32 +08:00
Nurono
dd5fa715f8 Fix an inconsistency in the docs 
``salt.runners.fileserver`` has no function ``clear_list_cache``
Its name should be ``clear_file_list_cache`` instead.
 2018-01-30 14:44:14 +03:00
rallytime
ce3902b158
Merge branch '2017.7' into merge-oxygen 2018-01-28 08:51:03 -05:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
 2018-01-26 17:27:03 -05:00
Elias Probst
bec78276f3
Replace left-over mistyped codename reference (Hellium → 2014.7.0) 2018-01-26 22:52:10 +01:00
rallytime
d4dac9f7cc
Merge branch '2016.11' into '2017.7' 
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
 2018-01-25 10:42:14 -05:00
rallytime
d31b41adeb
Update man pages for 2017.7.3 release 2018-01-24 13:46:43 -05:00
Ch3LL
529bc0c680
update release number for salt-call man page 2016.11.9 2018-01-19 16:10:27 -05:00
Ch3LL
11b7222148
Update man pages for 2016.11.9 2018-01-19 16:05:42 -05:00
Senthilkumar Eswaran
238941cd02 Fixing a typo in the troubleshooting document 2017-10-12 22:28:25 -07: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
Silvio Moioli
4a35fe5019 multiprocessing minion option: documentation fixes 2017-09-21 11:30:21 +02:00
Silvio Moioli
625eabb83f multiprocessing minion option: documentation fixes 2017-09-21 10:55:52 +02:00
Felix Dreissig
5b55fb2452 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-05-09 11:10:29 -06:00
Vitali Quiering
91f2963922 Add logstash engine protocol to manual 2017-03-24 17:03:22 +01:00
John Kristensen
8e92152533 Add key_text option to apt pkgrepo.managed (closes #37936) 
It may not always possible or desirable to upload a GPG key to a
keyserver (`keyid`/`keyserver`) or to host it on remote server
(`key_url`). This just leaves storing the key in a state using a
`salt://` URL.

It seems like the states is the wrong place to hold this sort of data,
and would be more suited to being in the pillar.

Adding a `key_text` option to the apt `pkgrepo.managed` module, which
accepts a GPG key in string form, can assist in importing a GPG key from
pillar data.
 2017-03-16 00:25:21 +11:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
Mike Place
cbd66a0d3f Merge pull request #39676 from F30/hash-comment 
Fix comments about the "hash_type" option
 2017-02-27 13:11:40 -07:00
Felix Dreissig
5371bc0996 Fix comments about the "hash_type" option 
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
 2017-02-26 23:24:54 +01:00
Felix Dreissig
78a185ab11 Fix comments about file backup directory 
The actual file state backup directory is called "file_backup" without a
trailing 's'.
 2017-02-26 22:49:29 +01:00
rallytime
c46f82c029 Merge branch '2016.11' into 'develop' 
Conflicts:
  - requirements/dev_python27.txt
  - requirements/dev_python34.txt
 2017-02-21 14:20:20 -07:00
Cory Wright
cc90d0d53f The Reactor docs should use pillar='{}' instead of 'pillar={}' 2017-02-17 11:07:39 -06:00
Jean-Claude Computing
94f349a900 Fix documentation for detach's default value 2017-02-15 20:29:29 +01:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07:00
Ronald van Zantvoort
cb445550a6 typofix 2016-11-08 01:13:12 +01:00
Ronald van Zantvoort
ae4e86ccc2 modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
rallytime
e57fb947c6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/status.py
 2016-11-01 12:56:04 -06:00
Nicole Thomas
5328bc8d99 Update man pages for 2016.11 (#37354) 2016-10-31 13:09:01 -06:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
0df3feec3c Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-10-28 09:25:00 -06:00
Nicole Thomas
47290d88a2 Update man pages for the 2016.3 branch (#37259) 2016-10-26 13:32:38 -06:00
Mike Place
76562d2c4e Merge pull request #36647 from MTecknology/develop 
Documentation Updates: reactor/orchestrator/git_fileserver
 2016-09-30 19:22:33 +09:00
Michael Lustfield
58da3da949 Missed that the correct link gets created; yay sphinxdoc 2016-09-28 13:43:02 -07:00
Michael Lustfield
6d93b2a367 Adding quotes to help identify this is a document title; would link if this was not a man page 2016-09-28 13:22:02 -07:00
Michael Lustfield
41e07a78a1 Making an attempt to clarify a few things in the salt.fileserver.gitfs section 2016-09-28 13:19:59 -07:00
Aneesh Agrawal
ffb717fec3 archive.extracted: Use user/group, not archive_user 
Ensure that any created parent directories are made with `user`/`group`
perms, not as the `archive_user` user. This also allows setting the
group for these dirs instead of defaulting to `root`.

The `archive_user` argument to archive.extracted has been deprecated
since version 2014.7.2, and supplanted by the `user` parameter in
2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
complete the deprecation by:
- no longer silently using `archive_user` in `archive.extracted`,
  preferring instead `user` and `group`,
- no longer accepted `archive_user` as an argument.

Also update man page.
 2016-09-28 10:14:59 -06:00