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,022 Commits 24 Branches 182 Tags 341 MiB
2acb188ac9
Commit Graph

76022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
2acb188ac9 Change `path` value from a tuple to a list 
The type of the ``path`` value changed in #38188.

This updates the type in the unit test, as well as rearranges some
of the imports to be more standardized with ``ensure_in_syspath``.
 2017-02-15 15:39:53 -07:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
 2017-02-15 10:35:02 -07:00
Erik Johnson
4ff13acf8b salt.fileserver.roots: Fix regression in symlink_list (#39409) 
A recent PR of mine removed the logic in symlink_list and fell back to
the cached file list generated in _file_lists(). However, this code
dates back from before the fileserver backends' symlink_list() functions
were modified to return a dict mapping links to their destinations.

This fixes the code in _file_lists() so that it returns the correct
data. It also fixes the fact that '.' was showing up in the dir list
produced by _file_lists(), and updates the associated integration test
to include the cachedir in the mocked opts.
 2017-02-15 10:06:17 -07:00
Mike Place
8b8ab8ef8e Merge pull request #39362 from dincamihai/cp-push-test-2016.3 
Add cp.push test
 2017-02-14 11:42:10 -07:00
Mike Place
878946d0f8 Merge pull request #39379 from terminalmage/issue34821 
win_pkg: remove all installed versions when no explicit version passed
 2017-02-14 11:41:28 -07:00
Mike Place
fd9ab8e4e3 Remove extra newline 2017-02-14 11:34:54 -07:00
Mike Place
4b726f955b Merge pull request #39380 from joe-niland/quote-numeric-usernames 
Quote numeric user names so pwd.getpwnam handles them properly
 2017-02-14 11:33:32 -07:00
Mike Place
1116d32df9 Merge pull request #39400 from meaksh/2016.3-fix-local-cache-issue 
Prevents 'OSError' exception in case certain job cache path doesn't exist
 2017-02-14 11:27:03 -07:00
Mike Place
caffef88cf Merge pull request #39392 from alprs/fix-nested_output_ordered_dict 
Make sure OrderedDict order is preserved in nested output
 2017-02-14 10:50:14 -07:00
Mike Place
f2459e3ce8 Merge pull request #39378 from dmurphy18/deb_pkg_fix 
Update make_repo in debbuild.py execution module to utilize timeout
 2017-02-14 10:10:14 -07:00
Pablo Suárez Hernández
e7e559ef5c Prevents 'OSError' exception in case path doesn't exist 2017-02-14 16:17:26 +00:00
Mihai Dinca
91383c5a19 Add cp.push test 2017-02-14 17:16:28 +01:00
Andreas Lutro
625a770a23 make sure OrderedDict order is preserved in output 
sorted(ret) will sort the keys on their own, discarding the original
order of the OrderedDict.
 2017-02-14 13:40:09 +01:00
Joe Niland
c2edfdd464 Quote numeric user names so pwd.getpwnam handles them properly 2017-02-14 11:50:35 +11:00
Erik Johnson
5871825b9e win_pkg: remove all installed versions when no explicit version passed 
This will make pkg.removed states work more intuitively, rather than
just trying to delete the newest available version.
 2017-02-13 17:00:28 -06:00
David Murphy
4bd47cc18a Updated all make_repo loops to use timeout value for retries 2017-02-13 15:48:45 -07:00
Mike Place
99554d9d72 Merge pull request #39369 from rallytime/bp-37338 
Back-port #37338 to 2016.11
 2017-02-13 14:41:18 -07:00
Mike Place
03ab8b1b5a Merge pull request #39303 from kstreee/fix-testcase-rm-batch-in-netapi 
Removes a redundant test case after removed 'batch' in 'netapi'.
 2017-02-13 12:55:46 -07:00
Mike Place
6c854da1d4 Merge pull request #39300 from terminalmage/loader-optimization 
Replace more usage of str.format in the loader
 2017-02-13 12:01:18 -07:00
Mike Place
60640f77d7 Merge pull request #39315 from Ch3LL/fix_run_salt_test 
improve salt-run salt.cmd test
 2017-02-13 12:00:14 -07:00
Emanuel Rietveld
2e7f6e8e37 Fix wait_status in boto_rds.create() 2017-02-13 11:59:59 -07:00
Mike Place
2ca63a93cd Merge pull request #39311 from morganwillcock/skip-reboot 
win_system: return False from a skipped reboot
 2017-02-13 11:59:10 -07:00
Mike Place
5286b5ff1b Merge pull request #39337 from terminalmage/issue34428 
Don't re-walk the roots fileserver in symlink_list()
 2017-02-13 11:41:16 -07:00
Mike Place
ce781deeb5 Merge pull request #39339 from cro/pillar_filetree_doc 
Add link to external pillar documentation for clarification.
 2017-02-13 11:40:12 -07:00
Mike Place
082105fa84 Merge pull request #39346 from joe-niland/handle-iis-bindings 
Ignore non-HTTP IIS bindings
 2017-02-13 11:18:35 -07:00
Mike Place
a3a9a8e1ed Merge pull request #39361 from gtmanfred/2016.11 
make sure both variables are strings.
 2017-02-13 10:20:16 -07:00
Elias Probst
2021f5b537 Add creation/configuration of Salt PKI dirs to hacking docs (#39341) 2017-02-13 09:39:42 -07:00
Daniel Wallace
ee2275ad67 make sure both variables are strings. 
With changing majorosversion and other stuff to integers, we need to
make sure to cast them to strings when running through fnmatch in
grains.filter_by
 2017-02-13 10:06:26 -06:00
Joe Niland
8d5afdb0ae win_iis module: list_sites - when retrieving bindings, ignore bindigs whose protocols do not have host headers 2017-02-13 13:37:05 +11:00
C. R. Oldham
410810cea2 Clarification on external pillar usage. 2017-02-11 23:07:38 -07:00
Erik Johnson
a7d2135dc2 Don't re-walk the roots fileserver in symlink_list() 
This prevents some unnecessary extra work when getting a list of
symlinks.
 2017-02-11 18:28:49 -06:00
Morgan Willcock
0f3abb613d Clarify success for shutdown function 2017-02-11 20:11:40 +00:00
Erik Johnson
fa3014393c Document the upstream RedHat bug with their pygit2 package (#39316) 
See https://github.com/saltstack/salt/issues/38630#issuecomment-274403448
 2017-02-10 16:09:35 -07:00
Nicole Thomas
ce1f01f81a Merge pull request #39317 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-10 16:07:31 -07:00
rallytime
c1df446b7a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/returners/postgres.py
  - salt/returners/postgres_local_cache.py
 2017-02-10 10:18:26 -07:00
Nicole Thomas
9de559ff4e Merge pull request #39313 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-02-10 09:23:22 -07:00
Ch3LL
b3cbc5a408 improve salt-run salt.cmd test 2017-02-10 09:00:12 -07:00
rallytime
0b8dddf12b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-02-10 08:24:51 -07:00
Nicole Thomas
dd3ca0ecb0 Fix #38595 - Unexpected error log from redis retuner in master's log (#39299) 2017-02-10 08:21:57 -07:00
Morgan Willcock
dcb4d05275 win_system: return False from a skipped reboot 
...and clarify what success represents.
 2017-02-10 14:26:08 +00:00
kstreee
51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. 2017-02-10 07:12:22 +00:00
Mike Place
c3c621aab0 Merge pull request #38464 from doublescoring/fix-2016.11-38451 
[38451] Fix file.replace 2016.11
 2017-02-09 16:07:48 -07:00
Mike Place
f16027d30e Merge pull request #39297 from cro/pg_returner_docs 
Add doc to recommend pgjsonb for master job caches
 2017-02-09 15:49:58 -07:00
Mike Place
fc551bcf5d Merge pull request #39293 from sergeizv/grammar-fix 
Grammar fix
 2017-02-09 15:49:10 -07:00
Mike Place
8a1b45632a Merge pull request #39295 from sergeizv/typo-fix 
Fix typo
 2017-02-09 15:48:58 -07:00
Erik Johnson
d3e5d1525e Replace more usage of str.format in the loader 
This performs additional optimizations like the ones done in #39227.
 2017-02-09 16:34:32 -06:00
Mike Place
cfaafece34 Merge pull request #39296 from sergeizv/whitespace-fix 
Whitespace fix in docs Makefile
 2017-02-09 15:26:23 -07:00
Mike Place
0b4dcf4a47 Merge pull request #39294 from sergeizv/fix-link 
Fix link in proxyminion guide
 2017-02-09 15:15:51 -07:00
C. R. Oldham
28bac649ae Typo 2017-02-09 14:49:45 -07:00
C. R. Oldham
19fedcdd23 Add doc to recommend pgjsonb for master job caches 2017-02-09 14:46:59 -07:00