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,205 Commits 24 Branches 182 Tags 341 MiB
d39b679d82
Commit Graph

76205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
56162706e3 Merge pull request #39431 from UtahDave/fix_grains.setval_performance 
Fix grains.setval performance
 2017-02-15 16:56:30 -07:00
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
Nicole Thomas
54a572e50c Merge pull request #39429 from rallytime/bp-39364 
Back-port #39364 to 2016.11
 2017-02-15 14:27:21 -07:00
Dimitri Maziuk
4f877c6b6f Quick and dirty fix for GECOS fields with more than 3 commas 
Issue #39203
 2017-02-15 15:08:59 -06:00
David Boucha
391bbecd90 add docs 2017-02-15 13:49:24 -07:00
David Boucha
709c197f84 allow sync_grains to be disabled on grains.setval 2017-02-15 13:42:18 -07:00
Ivan Babrou
0df6b922e7
Narrow down connection exception to socket.error 2017-02-15 12:34:04 -08:00
Daniel Wallace
157f4dcdf9 set default user variable to the user cmd runs as 2017-02-15 13:07:44 -07:00
Mike Place
881ebf2e93 Merge pull request #39424 from twangboy/win_fix_dos 
Fix problem with too many connection attempts in Windows
 2017-02-15 11:51:34 -07:00
Morgan Willcock
a7d5118262 Return failure when package path does not exist 2017-02-15 17:58:59 +00: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
Mike Place
47872355a8 Merge pull request #39419 from The-Loeki/bp-ssh-ipv6 
Backport Salt-SSH IPv6 fixes to 2016.11
 2017-02-15 10:33:12 -07:00
Mike Place
239e16e612 Merge pull request #39405 from rallytime/fix-39304 
Update :depends: docs for boto states and modules
 2017-02-15 10:32:07 -07:00
Mike Place
415102f346 Merge pull request #39411 from rallytime/fix-38762 
Update external_cache docs with other configuration options
 2017-02-15 10:30:39 -07:00
Erik Johnson
7e1803b617 Update docs on upstream EPEL7 pygit2/libgit2 issues (#39421) 
pygit2 was rebuilt, but libgit2 still needs a rebuild. I opened an
upstream bug report this morning, this updates the docs to reflect the
current status of this upstream issue.
 2017-02-15 10:10:39 -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
twangboy
e67387deb7 Add option to return a Non instantiated class 2017-02-15 10:01:22 -07:00
twangboy
d3f7dd7f50 Add sleep to eval_master 2017-02-15 09:45:09 -07:00
Ronald van Zantvoort
4fc5626f16 Don't overwrite self.host w/IPv6 brackets 2017-02-15 15:44:06 +01:00
Ronald van Zantvoort
dd1223468b Salt-SSH deal with raw IPv6 addresses 2017-02-15 15:43:51 +01:00
rallytime
e13febe58d Update external_cache docs with other configuration options 
There are more places than just the minion config file to define
external job cache configuration settings for minions. This change
updates the docs to include some of those other places and the
order in which they're evaluated if the settings are defined in
more than one place.

Fixes #38762
 2017-02-14 17:18:35 -07:00
rallytime
bd1fe03ce7 Update :depends: docs for boto states and modules 
Some boto states and modules declare that they depend on the
boto3 lib. That's all good. But some of these states and modules
_also_ depend on the regular boto lib. This updates the docs
to reflect this.

Fixes #39304
 2017-02-14 13:33:04 -07:00
Ivan Babrou
e8a2cc0488
Do no try to connect to salt master in syndic config test 2017-02-14 11:16:32 -08: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
twangboy
315b0cc105 Clarify return value for win_osinfo 2017-02-14 11:10:56 -07:00
twangboy
994314ed3d Fix more docs 2017-02-14 11:08:40 -07:00
twangboy
2bbe3cbf49 Fix some docs 2017-02-14 11:07:53 -07:00
twangboy
4103563ee1 Merge branch 'gate_win_utils' of https://github.com/twangboy/salt into gate_win_utils 2017-02-14 11:06:11 -07:00
twangboy
82a86ced55 Add helper function for winservice 2017-02-14 11:03:06 -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
twangboy
0051b5a5e2 Put the win_osinfo classes in a helper function 2017-02-14 10:48:24 -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
24c1bd079d Remove extra newlines 
Fixes lint error
 2017-02-13 13:03:21 -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
twangboy
4e08534877 Gate win_osinfo and winservice better 2017-02-13 11:58:59 -07:00