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
62,348 Commits 24 Branches 182 Tags 341 MiB
673e1aa1aa
Commit Graph

62348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
673e1aa1aa Merge pull request #35233 from terminalmage/issue32719 
Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty
 2016-08-07 07:58:32 +09:00
Mike Place
cdf3c0fe73 Merge pull request #35202 from multani/fix/test-doc 
doc: fix broken links in the test documentation page
 2016-08-06 17:29:40 +09:00
Mike Place
e1331cd2a3 Merge pull request #35236 from rallytime/bp-35119 
Back-port #35119 to 2015.8
 2016-08-06 17:10:53 +09:00
Mike Place
4f2b8aa5b6 Merge pull request #35240 from derekmaciel/bp-35225 
Backport #35225 to 2015.8
 2016-08-06 16:54:19 +09:00
Mike Place
4bcfaa97d0 Merge pull request #35241 from terminalmage/gitfs-fixes 
Ensure max recursion in gitfs results in no blob object being returned.
 2016-08-06 16:53:49 +09:00
Mike Place
f6d7360e0b Merge pull request #35245 from rallytime/bp-35039 
Back-port #35039 to 2015.8
 2016-08-06 16:52:44 +09:00
Mike Place
d65a5c7134 Merge pull request #35249 from terminalmage/issue35214 
Fix regression in git.latest
 2016-08-06 16:52:15 +09:00
Erik Johnson
bcd5129e9f Fix regression in git.latest when update is fast-forward 2016-08-05 20:49:27 -05:00
Erik Johnson
e2e8bbbfde Add integration test for #35214 2016-08-05 20:47:24 -05:00
Seth House
51ab9cd6d4 Add saltenv support to module.run 
This kwarg gets stripped by the state compiler before this function is
ever invoked.
 2016-08-05 15:23:42 -06:00
Erik Johnson
e05648cc2d Break from loop when file is found 2016-08-05 14:08:24 -05:00
Erik Johnson
6764a88601 Ensure that failed recursion results in no blob object being returned 2016-08-05 14:07:50 -05:00
Derek Maciel
9ed47f713a Add missing documentation for pkg.installed 2016-08-05 13:27:07 -04:00
Derek Maciel
9ade78de7b Revise unnecessary code duplication 2016-08-05 09:57:29 -06:00
Derek Maciel
7c15f5b20a Fix formatting 2016-08-05 09:57:29 -06:00
Derek Maciel
64f93f8938 Assume two EVRs are equal if E and V are equal but one R is missing. 2016-08-05 09:57:29 -06:00
Erik Johnson
730a077041 Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty 
This prevents DNS resolution issues from causing ``salt-call --local``
to hang.

Resolves #32719.
 2016-08-05 09:25:47 -05:00
Jonathan Ballet
1642dba5d1 doc: fix broken links in the test documentation page 2016-08-04 16:56:42 +02:00
Nicole Thomas
67d8dd0fd0 Don't discard running beacons config when listing becaons (#35174) 
Refs #34827
 2016-08-03 13:35:14 -06:00
Nicole Thomas
3754550dd2 Add missing CLI Examples to aws_sqs module funcs (#35173) 2016-08-03 11:14:13 -06:00
Jacob Hammons
4967ed275f doc version update to 2015.8.11, updates to release notes (#35145) 2016-08-02 13:55:32 -06:00
Mike Place
81845ee31d Merge pull request #35114 from terminalmage/git_pillar-env-remap-docs 
Add clarification docs on a common git_pillar misconfiguration
 2016-08-01 18:30:47 -06:00
Erik Johnson
5951554e9f Add clarification docs on a common git_pillar misconfiguration 2016-08-01 18:54:50 -05:00
Erik Johnson
88a9fb1b31 Merge pull request #34768 from hrumph/bad-installed-state 
Fixes #34767
 2016-08-01 16:46:16 -05:00
Mike Place
343576408f Merge pull request #35043 from rallytime/new-release-notes 
Start release notes file for 2015.8.12
 2016-08-01 11:22:04 -06:00
Mike Place
848bf0272f Merge pull request #35050 from terminalmage/fix-saltdev-arg 
[orchestration] Properly handle runner/wheel funcs which accept a 'saltdev' argument
 2016-08-01 09:48:08 -06:00
Mike Place
2144178ae0 Merge pull request #35066 from jfindlay/postgres_log 
returners.postgres_local_cache: do not log in __virtual__
 2016-07-29 19:32:17 -06:00
Justin Findlay
c2c442234f returners.postgres_local_cache: do not log in __virtual__ 2016-07-29 13:03:36 -06:00
Erik Johnson
40cfa7cf17 Avoid needlessly running 2 argspecs in salt.utils.format_call() 
Both format_call() and arg_lookup() perform an argspec, and
format_call() invokes arg_lookup(). This commit allows for an argpsec to
be passed into arg_lookup(), avoiding the need to perform the argspec a
second time.
 2016-07-29 13:08:31 -05:00
Erik Johnson
fd186b7e4c Pass environment as 'saltdev' if runner/wheel func accepts a saltdev argument 2016-07-29 01:54:00 -05:00
Erik Johnson
951b52ab93 Pass __env__ from saltmod orch states to to saltutil.{runner,wheel} 2016-07-29 01:52:45 -05:00
rallytime
bdcc81a384 Start release notes file for 2015.8.12 2016-07-28 17:16:49 -06:00
Mike Place
7121618142 Merge pull request #35024 from bobrik/daemon-reload-fix 
Cache systemd unit update check per unit, closes #34927
 2016-07-28 11:56:29 -06:00
Mike Place
865c29f126 Expressly deny a minion if a key cannot be found instead of raising stacktrace (#35026) 2016-07-28 11:17:57 -06:00
Ivan Babrou
c300615e9d
Cache systemd unit update check per unit, closes #34927 2016-07-28 16:41:19 +01:00
Nicole Thomas
2b511f3013 Merge pull request #35000 from rallytime/bp-33875 
Back-port #33875 and #34999 to 2015.8
 2016-07-27 15:55:58 -06:00
rallytime
35696ad637 Pylint fix 2016-07-27 15:12:41 -06:00
Mike Place
f9fd6ddd8a Fixup #33875 2016-07-27 13:25:59 -06:00
Eu
56b1f6c651 Fix naive fileserver map diff algorithm 
Naively comparing sorted dict keys does not guarantee that maps are equal. We
must compare mtimes for filenames in case keys are the same to make sure there
isnt a modified file.
 2016-07-27 13:24:19 -06:00
Nicole Thomas
837bc6ba7d Merge pull request #34994 from rallytime/bp-34835 
Back-port #34835 to 2015.8
 2016-07-27 12:21:10 -06:00
Thomas S Hatch
9268a793de same thing for the mine in salt-ssh 2016-07-27 11:27:51 -06:00
Thomas S Hatch
3e11e19714 Fix the mine in salt ssh 2016-07-27 11:27:51 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout 
SSH timeout
 2016-07-27 11:24:37 -06:00
Mike Place
5f8370ae8d Refine errors in client (#34976) 
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
 2016-07-27 11:05:31 -06:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
Mike Place
a83cdf9339 Merge pull request #34831 from thatch45/recoverssh 
If the thin does not match, then redeploy, don't error
 2016-07-26 16:27:01 -06:00
Michael Walton
e1fcb8311d Put pkg.latest_version in try/except structure 
Move refreshed or refresh to different spot (just for code tidyness)
 2016-07-25 13:22:17 -04:00
Mike Place
ec8fc058d4 Master performance improvement (#34916) 
Reduce unneeded call to ckminions from master pub. This should be a 2x improvement or so in pub times.
 2016-07-25 09:52:46 -06:00
Mike Place
34dc2fd792 Merge pull request #34911 from cachedout/backport_34906 
Backport #34906
 2016-07-22 17:23:24 -06:00