Commit Graph

81320 Commits

Author SHA1 Message Date
Ken Crowell
6c0124ae21 Call tornado.httputil.url_concat compatibly
See https://github.com/tornadoweb/tornado/pull/1899.
2017-04-20 11:37:20 -06:00
Mike Place
c6c3b51a97 Merge pull request #40720 from oeuftete/support-tornado-4.5.0
Call tornado.httputil.url_concat compatibly
2017-04-20 11:22:54 -06:00
rallytime
ae6afedd4e Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-20 11:22:19 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_pkg.py
2017-04-20 11:21:10 -06:00
rallytime
22500a7261 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/utils/s3.py
2017-04-20 11:18:43 -06:00
Mike Place
3b9ebeb98f Merge pull request #40754 from lordcirth/fix-uppercase-checksums
file.manage_file: uppercase checksums now work
2017-04-20 11:17:49 -06:00
Mike Place
68542f7aec Merge pull request #40768 from twangboy/fix_win_lgpo
Fix _build_parent_list function for Py3
2017-04-20 11:15:39 -06:00
Mike Place
b35c1ff258 Merge pull request #40779 from Enquier/40770_returner_doc_reorder
Reordering Write Returners documentation
2017-04-20 11:09:44 -06:00
rallytime
6d59ed9481 Remove unused import 2017-04-20 11:05:46 -06:00
Mike Place
b5942d1c6a Newlines between funcs
For lint check
2017-04-20 10:48:54 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
2017-04-20 10:45:13 -06:00
Mike Place
623e2eb61f Merge pull request #40791 from a-powell/s3-util-get-memory-fix
S3 util get memory fix
2017-04-20 10:32:26 -06:00
Tom Williams
8773cbb860 INFRA-4728 - pylint fixes 2017-04-20 12:24:40 -04:00
Mike Place
f0f135c71d Merge pull request #40796 from terminalmage/fix-nodegroup-docs
Fix inaccurate nodegroup docs
2017-04-20 10:08:21 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
2017-04-20 10:07:19 -05:00
Alex Powell
36f6521014 Merge remote-tracking branch 'upstream/2016.3' into s3-util-get-memory-fix 2017-04-20 13:23:14 +01:00
Alex Powell
04637cd4eb Fixing objects being loaded into memory when performing a GET request with a local file specified. 2017-04-20 13:22:29 +01:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec
Pass path to msiexec overloading msiexec parameter
2017-04-20 12:25:52 +03:00
Tom Williams
0e20f7074b INFRA-4728 - first draft of boto3_sns execution and state modules 2017-04-20 04:11:30 -04:00
Terence Kent
f9cd187631 Add support for performing a state.show_sls for the state runner module. This is a very useful feature when writing orchestrate SLS files. 2017-04-19 16:34:06 -07:00
Steve Groesz
715df9a911 Add test for new kernelversion grain 2017-04-19 17:46:00 -05:00
Steve Groesz
8a84b3b963 add kernelversion grain for Win 2017-04-19 17:44:00 -05:00
Steve Groesz
80f178223c implement kernelversion grain 2017-04-19 17:26:57 -05:00
Mike Place
c80c792704 remove too many newlines for lint 2017-04-19 15:42:57 -06:00
Mike Place
c406d3de0d Merge pull request #40773 from mchugh19/patch-2
Update msteams.py
2017-04-19 14:50:14 -06:00
Enquier
b81856e370 Reordering Write Returners documentation 2017-04-19 14:49:28 -06:00
rallytime
e9f1d998cb Remove support for various deprecated state functions and kwargs
- salt/states/archive.py
- salt/states/cmd.py
- salt/states/file.py
- All changes were documented in the oxygen release notes
2017-04-19 14:35:04 -06:00
rallytime
59398f658e Remove support for deprecated win_* execution modules
- Removed win_psget.psversion function
- Removed win_service.config function
- Removed support for various kwargs in the win_service.create function
- Updated Oxygen release notes with all changes
2017-04-19 14:35:04 -06:00
rallytime
d9986185cf Remove support for deprecated "requests_lib" option
Use "backend" instead.
2017-04-19 14:35:04 -06:00
Nicole Thomas
d8f78550d9 Merge pull request #40769 from rallytime/bp-40760
Back-port #40760 to 2016.11
2017-04-19 14:23:21 -06:00
rallytime
a8a327a732 Add deprecation messages to the trafficserver execution module
This commit also includes a PY3 compatibility/pylint fix for the state module

The import for salt.utils was also fixed and all references in this state
were updated.
2017-04-19 14:19:48 -06:00
Christian McHugh
0f43b2b871 Update msteams.py
Correct color handling
2017-04-19 20:10:18 +01:00
rallytime
1af4d20cf0 Add deprecation message to trafficserver.set_var function
The set_var function has a deprecation notice in the documentation
only for the trafficserver.set_var function, but no warning at the
CLI/logs. This PR adds a "warn_util" message.

Since there haven't been any warnings to the user about the removal
of this function, the version is being bumped from Oxygen to Fluorine
so users have time to adapt as needed.
2017-04-19 12:54:47 -06:00
Jeffrey 'jf' Lim
71ac15fc4c Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! 2017-04-19 12:04:51 -06:00
Nicole Thomas
99048b1792 Merge pull request #40757 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-19 11:48:16 -06:00
Nicole Thomas
61f8de43df Merge pull request #40756 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-04-19 11:47:50 -06:00
Mike Place
9f261b35ec Merge pull request #40758 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-19 10:59:55 -06:00
twangboy
9a5671adf8 Fix _build_parent_list function for Py3 2017-04-19 10:36:31 -06:00
Nicole Thomas
f0fb6d3965 Merge pull request #40760 from jf/fix_consul_pillar_doc_writeup
Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'!
2017-04-19 09:20:31 -06:00
chqian
f7da655119 Fix an issue where list_pkgs failed to parse 'opkg list-installed' output containing package descriptions. 2017-04-19 22:27:11 +08:00
Dennis Dmitriev
cfb0ff7295 Fix missing variable error 2017-04-19 16:47:09 +03:00
Dennis Dmitriev
d0fd4a4c19 Move qemu-kvm image creation into a separate method
Also, changed priority for 'image' argument - now the module
argument will override the argument from disk profile.
2017-04-19 15:04:46 +03:00
Pablo Suárez Hernández
bd1f170a05 Fixes Zypper unit test 2017-04-19 10:18:46 +01:00
Jeffrey 'jf' Lim
f45c276775 Fix 'root=/...' references in consul_pillar documentation: 'keys should not start with a forward slash'! 2017-04-19 10:44:18 +08:00
rallytime
0616405104 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-18 16:43:11 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-04-18 16:42:30 -06:00
rallytime
0e087323f1 Merge branch '2016.3' into '2016.11'
No conflicts.
2017-04-18 16:41:22 -06:00
Nathan Fish
a7d8f375e8 file.manage_file: uppercase checksums now work
fixes #38914
2017-04-18 18:10:31 -04:00
Mike Place
408699ac54 Merge pull request #40730 from ecdavis/boto_iam-delete-virtual-mfa-device
Change boto_iam.user_absent state to delete IAM user's virtual MFA device after deactivation.
2017-04-18 14:44:35 -06:00
Mike Place
421d7be152 Merge pull request #40731 from basepi/sync_fileservers
Add fileserver syncing
2017-04-18 14:19:15 -06:00