valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,934 Commits 24 Branches 182 Tags 341 MiB
4c5ab057ce
Commit Graph

69934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
4c5ab057ce
Remove debugging 2016-11-07 14:03:44 +13:00
Mike Place
17d01e4f4c
Log proper message on returners that cannot be loaded 
Closes #37444
 2016-11-07 14:01:46 +13:00
Mike Place
2422dafd52 Merge pull request #37494 from sjorge/2016.3-osfam_map 
Forgot to update os_family map in #37472
 2016-11-07 11:18:54 +13:00
Mike Place
41bd8e3f52 Merge pull request #37496 from mcalmer/fix-status-handling-in-sysv-init-scripts 
fix status handling in sysv init scripts
 2016-11-07 11:18:00 +13:00
Mike Place
e741a773a5 Merge pull request #37497 from terminalmage/release_notes 
Update 2016.3.5 release notes with source_hash_name explanation
 2016-11-07 11:17:40 +13:00
Erik Johnson
c08038d9ea Update 2016.3.5 release notes with source_hash_name explanation 2016-11-06 11:53:41 -06:00
Michael Calmer
1fb2c4dfcf fix status handling in sysv init scripts 2016-11-06 18:49:12 +01:00
Super-User
96ba545492 Forgot to update os_family map in #37472 2016-11-06 14:06:34 +01:00
Mike Place
f4426c2233 Merge pull request #37486 from twangboy/fix_win_docs 
Add requirement for PowerShell 3 on Windows
 2016-11-06 19:01:07 +13:00
Mike Place
a1f355a569 Merge pull request #37493 from cachedout/minion_master_sdb 
Add sdb support to minion and master configs
 2016-11-06 19:00:18 +13:00
Mike Place
be93710fee Merge pull request #37452 from rallytime/fix-31135 
file.line with mode=replace on an empty file should return False, not stacktrace
 2016-11-06 14:55:11 +13:00
Mike Place
129b0387e6 Merge pull request #37469 from terminalmage/issue29010 
Rewrite file.extract_hash to improve its matching ability
 2016-11-06 14:50:01 +13:00
Mike Place
9426b9d5c4 Merge pull request #37472 from sjorge/2016.3-solaris-grains 
2016.3 solaris grains improvements
 2016-11-06 14:46:09 +13:00
Mike Place
9761a462c2
Add sdb support to minion and master configs 2016-11-06 14:29:40 +13:00
Super-User
2958f5ce52 detect and properly handle OmniOS 2016-11-04 22:25:23 +01:00
twangboy
9e0631a1ae Add docs denoting the requirement for at least PowerShell 3 2016-11-04 14:04:43 -07:00
Super-User
37c3a7f5ab handle Oracle Solaris better 2016-11-04 21:33:11 +01:00
Nicole Thomas
4ba63aba48 Merge pull request #37478 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-11-04 14:30:08 -06:00
Nicole Thomas
8aa101a99c Get release notes started for 2016.3.5 (#37485) 2016-11-04 14:22:26 -06:00
Nicole Thomas
dfd94959b6 [2016.3] Doc version updated to 2016.3.4 (#37483) 2016-11-04 14:12:19 -06:00
rallytime
3483a445f2 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/utils/http.py
 2016-11-04 13:37:06 -06:00
Erik Johnson
a3f38e5a9f Update file.extract_hash unit tests 
These tests now not only test the new functionality added for matching
on source URI and source_hash_name, but also test non-specific hash_type
lookups, specific hash_type lookups, and failed specific hash_type
lookups (i.e. requesting a hash type not present in the file).
 2016-11-04 11:25:54 -05:00
Erik Johnson
b26b528f79 Add the source_hash_name param to file.managed states 2016-11-04 11:25:53 -05:00
Erik Johnson
52fe72d402 Rewrite file.extract_hash 
This rewrite makes it possible for file.extract_hash to match on more
than just the filename being managed, also matching on the source URL as
well as a new user-specified name.

It also makes this function more efficient, as only a single pass is
performed when the hash_type is unspecified. Before, it would read the
entire file for each hash type.

Finally, it adds the ``source_hash_name`` argument to
``file.get_managed``, so that it can be passed to this function by
``file.managed`` states.
 2016-11-04 11:25:53 -05:00
Super-User
69706d32be parse minorrelease if it has a / in it 2016-11-04 17:15:37 +01:00
Super-User
d1cf4a0e56 improve regex for parsing /etc/release using files from Solaris 8 SPARC and Solaris 10 2016-11-04 17:02:32 +01:00
Super-User
88eddef765 some more cleanup for smartos 2016-11-04 16:59:29 +01:00
rallytime
c792f76d2f Bump log level from debug to warning on empty file 2016-11-04 09:38:49 -06:00
Super-User
d3ff39f09c improve smartos os version grains 2016-11-04 16:32:56 +01:00
Mike Place
580eca709b Merge pull request #37121 from nevins-b/2016.3 
allow the file.recurse state to support saltenv
 2016-11-04 18:59:28 +13:00
Mike Place
35888c2e30 Merge pull request #37408 from terminalmage/issue37286 
Strip slashes from gitfs mountpoints
 2016-11-04 17:51:27 +13:00
Mike Place
b6c57c6c8d Merge pull request #37418 from terminalmage/issue36849 
Do not use compression in tornado httpclient requests
 2016-11-04 17:41:57 +13:00
Mike Place
766b1437c2 Merge pull request #37426 from jfindlay/mac_sleep 
Wait for macOS to change system settings
 2016-11-04 17:35:51 +13:00
Mike Place
9eab5c8f71 Merge pull request #37438 from DSRCorporation/bugs/37238_salt_hang_on_master_restart 
Fix for #37238 salt hang on master restart
 2016-11-04 17:10:51 +13:00
Mike Place
9aa7073f70 Merge pull request #37440 from rallytime/bp-31207 
Back-port #31207 to 2016.3
 2016-11-04 17:09:33 +13:00
Mike Place
7fba8aaa7e Merge pull request #37441 from rallytime/bp-37428 
Back-port #37428 to 2015.8
 2016-11-04 17:07:54 +13:00
Mike Place
edbfadca21 Merge pull request #37442 from twangboy/fix_osx_postinstall 
Create paths.d directory
 2016-11-04 17:07:19 +13:00
Mike Place
afb1b3cee5 Merge pull request #37445 from twangboy/fix_import_error_2016.3 
Check for Server os before checking [DO NOT MERGE FORWARD]
 2016-11-04 17:04:49 +13:00
Mike Place
7a9f95ab3b Merge pull request #37446 from twangboy/fix_build_32 
Detect VC++ for Python on Win32
 2016-11-04 17:04:02 +13:00
Mike Place
651e0f728f Merge pull request #37447 from rallytime/fix-36961 
Cast ip_protocol rule as a str() in boto_secgroup.present
 2016-11-04 17:03:45 +13:00
Mike Place
a51d944c7c Merge pull request #37455 from techhat/issue36446 
Make api opts respect correct root_dir
 2016-11-04 16:25:40 +13:00
Mike Place
3591bf0f58 Merge pull request #37459 from twangboy/fix_dsc_json_msg_2016.3 
Fix error message when ConvertTo-Json not supported [DO NOT MERGE FORWARD]
 2016-11-04 16:22:31 +13:00
twangboy
949b70913d Use cmd.run_all instead of cmd.shell 2016-11-03 23:47:14 +00:00
Joseph Hall
7eff90d61d Make api opts respect correct root_dir 2016-11-03 15:33:28 -06:00
rallytime
5f181cf00d file.line with mode=replace on an empty file should return False 
Fixes #31135

If a file exists but is empty, we are stack tracing on a call to
the body.split(os.linesep) function. This fix sets the body variable
to an empty string instead of stack tracing when the file is empty.

This allows the function to return ``False``, since no match can be
found in an empty file.

I also adjusted one of the ``line`` variables in the ``replace`` block
because it was shadowing the outer line function scope.
 2016-11-03 14:58:50 -06:00
rallytime
94a00c66eb Write a unit test demonstrating stack trace in #31135 
Here is the stack trace that happens when running file.line with
mode=replace on a file that exists, but is empty, as described in
the bug report:

unit.modules.file_test.FileModuleTestCase.test_replace_line_in_empty_file  .................................................
   Traceback (most recent call last):
     File "/root/SaltStack/salt/tests/unit/modules/file_test.py", line 593, in test_replace_line_in_empty_file
       mode='replace'))
     File "/root/SaltStack/salt/salt/modules/file.py", line 1523, in line
       for line in body.split(os.linesep)])
   TypeError: expected a character buffer object
 2016-11-03 14:57:10 -06:00
rallytime
6b930ac7aa Cast ip_protocol rule as a str() in boto_secgroup.present 
Fixes #36961

Protects against a stacktrace lower in the function where we call
ip_protocol.isdigit(), which expects a string.
 2016-11-03 12:42:01 -06:00
twangboy
2de69f48f8 Detect VC for Python correctly on 32bit Windows 2016-11-03 18:23:19 +00:00
twangboy
c0d5ebdd8a Check for Server os before checking 2016-11-03 10:31:32 -07:00
Justin Findlay
43a8e199bf modules.mac_power: wait for system to make change 2016-11-03 10:33:19 -06:00