Commit Graph

69974 Commits

Author SHA1 Message Date
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
Nicole Thomas
c505a059ef [2015.8] Doc version updated to 2016.3.4 (#37482) 2016-11-04 14:10:24 -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
rallytime
8b2d2b9e7b Clarify file.line state docs as well 2016-11-04 10:04:37 -06:00
rallytime
b2615892eb Move note about using mode=insert with location options to mode section 2016-11-04 10:03:25 -06: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
rallytime
db0b0cefb8 Fixup file.line docs to be more clear and consistent
Refs #31081
2016-11-03 16:35:12 -06: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
Justin Findlay
feabca6e0b modules.mac_system: wait for system to make change 2016-11-03 10:33:19 -06:00
Justin Findlay
0213eb9a07 utils.mac_utils: add confirm_updated 2016-11-03 10:33:19 -06:00
twangboy
8091a3065e Create paths.d directory 2016-11-03 09:27:50 -06:00
Mike Place
6fe3ef49de Fix incorrect reference of __utils__ in salt.utils
Closes #37388
2016-11-03 09:17:10 -06:00
Tarjei Husøy
c71ae61271 Remove error logging of missing boto libraries
Current behavior always error logs, even if the module is not going to
be used. The loader will raise a proper error if it's attempted
accessed without having loaded properly anyway, and if that happens I'm
assuming you'll turn on debug logging and look for the cause. The
loader also logs which modules are not loaded and their reason, thus
there's no point in repeating the module name in the error message.
2016-11-03 09:15:57 -06:00
Nicole Thomas
80a99c4cc5 Merge pull request #37430 from meaksh/zypper-dist-upgrade-debug-solver-fix-2016.3
Including resolution parameters in the Zypper debug-solver call during a dry-run dist-upgrade (2016.3)
2016-11-03 08:35:46 -06:00
Mike Place
67cc7a7dc4 Fix incorrect reference of __utils__ in salt.utils (#37428)
Closes #37388
2016-11-03 08:33:40 -06:00
Dmitry Kuzmenko
f253d3ce4a Auto reconnect salt to master if the connection was lost.
1. Re-raise StreamClosedError in the SaltEvent if the event was created
with `raise_errors=True`.
2. Handle StreamClosedError in the client if the client was created with
`auto_reconnect=True`.
2016-11-03 17:13:33 +03:00
Pablo Suárez Hernández
ffc596f215 Including resolver params for Zypper debug-solver
Now '--no-allow-vendor-change' and '--from' parameters are included
into the zypper --debug-solver call before performing a dry-run dist-upgrade.
2016-11-03 08:34:26 +00:00
Nicole Thomas
7864f9b79d Merge pull request #37419 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-11-02 15:40:04 -06:00