Commit Graph

84761 Commits

Author SHA1 Message Date
Nicole Thomas
cceebc5b4e Merge pull request #42813 from lyft/upstream-boto_iam-user-group-inline-policy-deletion
Upstream support for deleting IAM user/group inline policies
2017-08-10 14:06:41 -04:00
Nicole Thomas
2dde1f77e9 Merge pull request #42851 from terminalmage/bp-42651
Backport #42651 to 2016.11
2017-08-10 14:02:38 -04:00
Thomas S Hatch
7c216921d4 Add a key in opts that identify that we are running salt-ssh 2017-08-10 10:26:07 -06:00
Daniel Wallace
a3da86eea8 fix syntax 2017-08-10 11:08:27 -05:00
Daniel Wallace
6ecdbcec1d make sure names are correct 2017-08-10 11:08:26 -05:00
Daniel Wallace
f83b553d6e add py3 for versionlock 2017-08-10 11:08:26 -05:00
Daniel Wallace
21934f61bb python2- prefix for fedora 26 packages 2017-08-10 11:08:25 -05:00
Nicole Thomas
f954f4f33a Merge pull request #42808 from terminalmage/issue42774
Fix regression in yum/dnf version specification
2017-08-10 11:59:22 -04:00
Andrea Mistrali
0e99a59998 Removed '--quiet' to avoid continuous renewal 2017-08-10 17:35:25 +02:00
garethgreenaway
5874ec10bf Merge branch 'develop' into 42640_etcd_directory 2017-08-10 08:31:55 -07:00
Erik Johnson
6ad45c242e Fix references to functions moved to salt.utils.platform
These refs all were added from a branch point before #42572. This commit
updates them to avoid a deprecation warning.
2017-08-10 10:27:40 -05:00
Jochen Breuer
d8f7d7a7c0 API changes for Kubernetes version 2.0.0
Switching to the new Kubernetes client lib API introduced with version 2.0.0.
2017-08-10 16:35:45 +02:00
spenceation
0880121cf4 Merge branch 'develop' into panos/develop 2017-08-10 10:25:25 -04:00
Nicole Thomas
19931f9ae8 Merge pull request #42824 from rallytime/fix-42819
Fix build_type and release variables for develop branch
2017-08-10 10:24:45 -04:00
spenceation
e1f9dbb987 2017-08-10 10:23:53 -04:00
rallytime
b16249a8b0 Update clean_kwargs utils path to use moved function in "args" util 2017-08-10 10:14:02 -04:00
rallytime
25f971d30c Use clean_kwargs from salt.utils
There are two different ways in this file that we're looking for keys
that start with "__" and removing them from kwargs. Let's just use
salt.utils.clean_kwargs.
2017-08-10 10:12:24 -04:00
Nicole Thomas
d9b0f44885 Merge pull request #42807 from rallytime/fix-42639
Update modules --> states in kubernetes doc module
2017-08-10 10:10:39 -04:00
Nicole Thomas
c746f79a3a Merge pull request #42806 from rallytime/fix-42683
Update doc references in glusterfs.volume_present
2017-08-10 10:10:16 -04:00
Nicole Thomas
27a8a2695a Merge pull request #42829 from twangboy/win_pkg_fix_install
Fix passing version in pkgs as shown in docs
2017-08-10 10:07:24 -04:00
Nicole Thomas
e0ac5b65a4 Merge pull request #42831 from terminalmage/unicode
Fix minor issues with #42572
2017-08-10 10:01:17 -04:00
Nicole Thomas
3c3ac6aeb2 Merge pull request #42838 from twangboy/win_doc_pki
Document requirements for win_pki
2017-08-10 09:59:45 -04:00
Erik Johnson
2a1adebad9 Merge pull request #42732 from michelsm/fix-file.absent-inconsistency
Set force=true when removing a windows directory
2017-08-10 08:54:24 -05:00
Nicole Thomas
b8c7bda68d Merge pull request #42841 from Mapel88/patch-1
Fix bug #42818 in win_iis module
2017-08-10 09:44:20 -04:00
Nicole Thomas
a62b08f0d4 Merge pull request #42835 from lyft/fix-typo-in-utils.versions
Fix typo in utils/versions.py module
2017-08-10 09:37:35 -04:00
spenceation
fe6070a554 Fixed LINT issues. 2017-08-10 09:35:56 -04:00
spenceation
8b6b53f8f0 Fixed EoL. 2017-08-10 08:46:51 -04:00
Mapel88
497241fbcb Fix bug #42818 in win_iis module
Exception in function "create_cert_binding".
function fails with the following exception:
2017-08-09 00:23:32,096 [salt.state ][ERROR ][2948] An exception occurred in this state: Traceback (most recent call last):
File "c:\salt\bin\lib\site-packages\salt\state.py", line 1837, in call
**cdata['kwargs'])
File "c:\salt\bin\lib\site-packages\salt\loader.py", line 1794, in wrapper
return f(*args, **kwargs)
File "c:\salt\var\cache\salt\minion\extmods\states\win_iisV2.py", line 326, in create_cert_binding
ipaddress, port, sslflags)
File "c:\salt\var\cache\salt\minion\extmods\modules\win_iisV2.py", line 861, in create_cert_binding
if binding_info not in new_cert_bindings(site):
TypeError: 'dict' object is not callable


**This is the problematic code:
new_cert_bindings = list_cert_bindings(site)
if binding_info not in new_cert_bindings(site):

Just need to remove (site) from second line as follows and it's fixed:
new_cert_bindings = list_cert_bindings(site)
if binding_info not in new_cert_bindings:**
2017-08-10 10:39:43 +03:00
twangboy
f0a1d06b46 Standardize PKI Client 2017-08-09 17:53:22 -06:00
twangboy
7de687aa57 Document requirements for win_pki 2017-08-09 17:49:20 -06:00
Aneesh Agrawal
90aa4abf2e Fix typo in utils/versions.py module 2017-08-09 22:44:25 +00:00
garethgreenaway
98e26dbc8f Merge branch 'develop' into fix-42819 2017-08-09 15:38:16 -07:00
garethgreenaway
b3e2ae3c58 Merge pull request #42805 from rallytime/bp-42552
Back-port #42552 to 2016.11
2017-08-09 15:37:55 -07:00
garethgreenaway
d2ee7934ed Merge pull request #42804 from rallytime/bp-42784
Back-port #42784 to 2016.11
2017-08-09 15:37:40 -07:00
garethgreenaway
135f9522d0 Merge pull request #42782 from rallytime/fix-42697
Add a cmp compatibility function utility
2017-08-09 15:37:29 -07:00
garethgreenaway
4db7de8543 Merge branch 'develop' into panos/develop 2017-08-09 15:35:04 -07:00
Nicole Thomas
e6357abdda Merge pull request #42718 from moio/yumpkg-list_pkg-attr-parameter
yumpkg.list_pkgs: add parameter for returned attribute selection
2017-08-09 16:58:02 -04:00
Erik Johnson
59e19a9c15 Fix minor issues with #42572
See https://github.com/saltstack/salt/pull/42572#pullrequestreview-55270580
2017-08-09 15:55:52 -05:00
Nicole Thomas
333d86d96c Merge pull request #42572 from terminalmage/unicode
Use explicit unicode strings + break up salt.utils
2017-08-09 16:54:48 -04:00
Nicole Thomas
4cbf8057b3 Merge pull request #42826 from terminalmage/fix-spelling
Fix misspelling of "versions"
2017-08-09 15:39:42 -04:00
spenceation
91026bba9c Update panos.py 2017-08-09 15:15:42 -04:00
spenceation
ac0ecf0d22 Update panos.py 2017-08-09 15:15:32 -04:00
spenceation
bd6aa2af4a Update panos.py 2017-08-09 15:15:08 -04:00
spenceation
530fb69daa Update panos.py 2017-08-09 15:14:59 -04:00
spenceation
1423ae18c7 Update panos.py 2017-08-09 15:14:27 -04:00
spenceation
bed46a6496 Update panos.py 2017-08-09 15:14:06 -04:00
spenceation
d211c3b84a Update panos.py 2017-08-09 15:13:38 -04:00
spenceation
335bcf8dd2 Update panos.py 2017-08-09 15:13:27 -04:00
twangboy
83b9b230cd Add winrepo to docs about supporting versions in pkgs 2017-08-09 12:05:42 -06:00
twangboy
81fefa6e67 Add ability to pass version in pkgs list 2017-08-09 11:59:32 -06:00