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
76,523 Commits 24 Branches 182 Tags 341 MiB
ec219b5f42
Commit Graph

76523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Kizunov
11766c7259 Fix exception in salt-call when master_type is 'disable' 
If `salt-call` is invoked without using the `--local` flag, it will
return an exception when `master_type` is `disable`. Fix this use
case.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-03-15 09:07:13 -06:00
velom
3fae91d879 correctly parse "pkg_name===version" from pip freeze 2017-03-15 18:00:38 +03:00
Erik Johnson
359af3bb2b Fix error when chhome is invoked by user.present state in Windows 2017-03-15 09:58:09 -05:00
Erik Johnson
5b5d1b375c Fix transposed lines in salt.utils.process 
Resolves #40011.
 2017-03-15 09:31:30 -05:00
Vyacheslav Spiridonov
14d71918b2 Fixes #39779 
This PR disallows modification of jobs received from pillar with `schedule` execution module.

 Function `config.merge` is no longer used to obtain schedule data, in favor for explicit merging of opts['schedule'] and opts['pillar']['schedule'], so that job source can be find out.

 This PR reverts some changes made in #36437 and takes different approach to the problem highlighted there.
 2017-03-15 13:15:28 +03:00
Nicole Thomas
86f7195e0e Merge pull request #40023 from jeanpralo/fix-minions-cant-finish-by-char-p 
We need to match on .p not just strip '.p' otherwise it will remove a…
 2017-03-14 17:14:55 -06:00
Nicole Thomas
277bd17ff2 Merge pull request #40025 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-14 17:14:32 -06:00
rallytime
029f28bbd5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/cmdmod.py
 2017-03-14 15:44:38 -06:00
Mike Place
ee7f3b1200 Merge pull request #40021 from Ch3LL/2016.3.6_release 
2016.3.6 release notes with change log
 2017-03-14 15:06:18 -06:00
Mike Place
8db74fb275 Merge pull request #40020 from dmurphy18/aix_timezone 
Full support for execution module timezone on AIX
 2017-03-14 15:05:30 -06:00
Mike Place
60066da614 Merge pull request #39924 from dmurphy18/salt_aix_fixMar 
Add AIX support for user and group execution modules
 2017-03-14 15:04:01 -06:00
Jean Praloran
d7b0c8ae88 We need to match on .p not just strip '.p' otherwise it will remove any p from the string even if we have no dot 2017-03-15 09:49:27 +13:00
Ch3LL
f3e7e4fb2a Add 2016.3.6 Release Notes 2017-03-14 13:39:48 -06:00
Mike Place
cd73eafec8 Merge pull request #40010 from jettero/s3-bucket-path-broken 
S3 bucket path broken
 2017-03-14 13:01:00 -06:00
Nicole Thomas
26895b7be2 Merge pull request #40016 from terminalmage/fix-grains-test 
Attempt to fix failing grains tests in 2016.3
 2017-03-14 12:34:31 -06:00
Nicole Thomas
0c61d064ad Merge pull request #39980 from vutny/cmd-run-state-bg 
[2016.3] Allow to use `bg` kwarg for `cmd.run` state function
 2017-03-14 11:16:13 -06:00
Nicole Thomas
0ec81a4cde Fixup a syntax error 2017-03-14 11:15:02 -06:00
David Murphy
aabbbffd45 Full support to execution module timezone on AIX 2017-03-14 11:00:14 -06:00
David Murphy
16d5c7ce4a WIP: timezone support for AIX 2017-03-14 11:00:14 -06:00
Pablo Suárez Hernández
9f5c3b7dcd Allows to set custom timeouts for 'manage.up' and 'manage.status' 2017-03-14 16:40:09 +00:00
Pablo Suárez Hernández
2102d9c75c Allows to set 'timeout' and 'gather_job_timeout' via kwargs 2017-03-14 16:39:28 +00:00
Erik Johnson
5d84b40bfd Attempt to fix failing grains tests in 2016.3 
The tearDown appears to only be removing the grain if it matches a
specific value. This may be leading to the grain value not being blank
at the time the next test is run.

Instead of only deleting the grain if it matches a specific value,
instead delete all items from that grain to ensure that it is empty for
the next test.
 2017-03-14 11:25:15 -05:00
Nicole Thomas
61f1fb04c5 Merge pull request #39991 from terminalmage/source_hash-docs 
Document the fact that the checksum type can be omitted in file.managed states
 2017-03-14 09:58:10 -06:00
Paul Miller
acee5bf7c8 clarify this, because it messes people up in the mailing lists, and myself briefly before I thought about it 2017-03-14 11:12:49 -04:00
Paul Miller
8102ac8e3c same here 2017-03-14 11:10:17 -04:00
Paul Miller
21b79e00be In order for the heredoc to be correct, bucket and path have to default to '', not None 2017-03-14 11:09:00 -04:00
Erik Johnson
b042484455 Merge pull request #39994 from rallytime/ulimits-dockerng-version 
Add a versionadded tag for dockerng ulimits addition
 2017-03-13 15:58:01 -05:00
rallytime
37bd800fac Add a versionadded tag for dockerng ulimits addition 
Fixes #39942
 2017-03-13 14:20:02 -06:00
Erik Johnson
e125c94ba5 Merge pull request #39988 from terminalmage/dockerng-timeout 
Add comment explaining change from #39973
 2017-03-13 13:37:28 -05:00
Mike Place
53d14d8ad9 Merge pull request #39984 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-13 12:30:15 -06:00
Erik Johnson
537fc36029 Document the fact that the checksum type can be omitted in file.managed states 
This has been the case since 2016.11.0 but only the archive.extracted
state's docstring included this updated information.
 2017-03-13 13:27:09 -05:00
Erik Johnson
bd2519ed1b Add comment explaining change from #39973 
See https://github.com/saltstack/salt/pull/39973#issuecomment-286142419
 2017-03-13 10:51:29 -05:00
rallytime
ef6f4b15ca Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-13 09:19:34 -06:00
Denys Havrysh
a81dc9dfc1 [2016.3] Allow to use bg kwarg for cmd.run state function 2017-03-13 11:59:03 +02:00
Mike Place
cd0336e868 Merge pull request #39973 from terminalmage/dockerng-timeout 
Don't use docker.Client instance from context if missing attributes
 2017-03-11 07:57:49 -07:00
Erik Johnson
869416e7db Don't use docker.Client instance from context if missing attributes 
Under some circumstances (which I can't reliably reproduce), the
docker.Client() instance does not have a timeout attribute, causing
anything that needs to use the docker client to result in a traceback.

This fixes this corner case (later branches initialize the timeout
differently).
 2017-03-10 21:48:49 -06:00
Nicole Thomas
31c00740e7 Merge pull request #39967 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-10 16:45:33 -07:00
rallytime
3022466615 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-10 14:37:51 -07:00
Mike Place
269a2fd739 Merge pull request #39963 from cachedout/disable_mentionbot_delay_11 
Mention bot delay disable for 2016.11
 2017-03-10 13:25:24 -07:00
Mike Place
5fcea05691
Mention bot delay disable for 2016.11 2017-03-10 13:24:39 -07:00
Mike Place
282c607d26 Merge pull request #39962 from cachedout/disable_mentionbot_delay_3 
Disable mention bot delay on 2016.3
 2017-03-10 13:24:07 -07:00
Mike Place
7a638f204b
Disable mention bot delay on 2016.3 2017-03-10 13:23:20 -07:00
Mike Place
6350b07384 Merge pull request #39952 from vutny/doc-faq-minion-upgrade-restart 
Fix #7997: describe how to upgrade Salt Minion in a proper way
 2017-03-10 11:41:56 -07:00
Mike Place
1e0c88ae08 Merge pull request #39937 from cachedout/gpg_zypper 
Fix --non-gpg-checks in zypper module
 2017-03-10 11:02:51 -07:00
Mike Place
dc7d4f4224 Merge pull request #39935 from cro/namespace_proxy_cfg 
Add special token to insert the minion id into the default_include path
 2017-03-10 10:51:54 -07:00
Nicole Thomas
9503a1d0c6 Merge pull request #39936 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-10 10:05:04 -07:00
Denys Havrysh
d989d749d6 Fix #7997: describe how to upgrade Salt Minion in a proper way 2017-03-10 16:17:19 +02:00
Mike Place
899e037f0a Merge pull request #39932 from rallytime/cp-beacon-fixes 
Cherry-pick the beacon fixes made in #39930 to 2016.11
 2017-03-09 17:21:08 -07:00
Mike Place
2e68edee4a Merge pull request #39933 from hkrist/fix-rawfile_json_returner-format 
Fixed rawfile_json returner output format.
 2017-03-09 17:20:51 -07:00
Mike Place
fb0dc33c42 Merge pull request #39934 from dmurphy18/fix_host_list 
Correct comment lines output from execution module's host.list_hosts
 2017-03-09 17:20:13 -07:00