valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,503 Commits 24 Branches 182 Tags 341 MiB
2b516313f2
Commit Graph

84503 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
spenceation
2b516313f2 Merge branch 'develop' into panos/develop 2017-08-12 16:48:32 -04:00
spenceation
e351974dd9 Updated with requested changes. 2017-08-11 21:24:17 -04:00
Nicole Thomas
af72988af6 Merge pull request #42850 from akelge/develop 
Removed '--quiet' to avoid continuous renewal
 2017-08-11 15:37:09 -04:00
Nicole Thomas
02c4ae644b Merge pull request #42852 from thatch45/ssh_id 
Add a key in opts that identify that we are running salt-ssh
 2017-08-11 15:36:10 -04:00
Nicole Thomas
a3635926f3 Merge pull request #42879 from rallytime/oxygen-formatting 
Update header markup for subsections
 2017-08-11 15:24:30 -04:00
Nicole Thomas
64da744949 Merge pull request #42507 from steverweber/nacl_with_sealedbox 
add support for nacl SealedBox and other extras
 2017-08-11 14:12:58 -04:00
rallytime
48445ff182 Update header markup for subsections 
The header section markup was incorrect in sections with sub-sections,
displaying the header text as smaller than the sub-section header text.

This fixes the header sizes
 2017-08-11 10:17:22 -04:00
Nicole Thomas
8aa34c81dd Merge pull request #42554 from joshland/rh_ip_fix 
fix: Fedora configuration fails because the sysctls don't exist
 2017-08-11 10:01:36 -04:00
Erik Johnson
d2c0474a99 Merge pull request #42100 from rallytime/cloud-runner-dry 
Use clean_kwargs from salt.utils in cloud runner
 2017-08-11 08:40:58 -05:00
Erik Johnson
804a4e41a9 Merge pull request #42854 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-11 08:39:33 -05:00
Nicole Thomas
66511646de Merge pull request #42871 from amalleo25/patch-1 
Update joyent.rst
 2017-08-11 09:30:31 -04:00
Andrea Mistrali
c613ec8698 Merge branch 'develop' into develop 2017-08-11 07:19:16 +02:00
amalleo25
559a2d448c Update joyent.rst 
Missing colon in example cloud.profiles.d config file.
 2017-08-10 23:08:38 -04:00
Nicole Thomas
4944bb8d55 Merge branch 'develop' into cloud-runner-dry 2017-08-10 17:49:04 -04:00
rallytime
5d8d6225b5 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/augeas_cfg.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/runners/manage.py
  - salt/states/boto_cfn.py
  - salt/utils/cloud.py
  - tests/integration/states/test_pkg.py
 2017-08-10 14:47:14 -04:00
Nicole Thomas
cf579503d7 Merge branch 'develop' into rh_ip_fix 2017-08-10 14:21:59 -04:00
Nicole Thomas
9f5c60b786 Merge pull request #42849 from terminalmage/fix-moved-funcs 
Fix references to functions moved to salt.utils.platform
 2017-08-10 14:07:53 -04:00
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
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
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
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
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
e0ac5b65a4 Merge pull request #42831 from terminalmage/unicode 
Fix minor issues with #42572
 2017-08-10 10:01:17 -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
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
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
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