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
99,803 Commits 24 Branches 182 Tags 341 MiB
d0d5726ffa
Commit Graph

99803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
d0d5726ffa
Merge branch '2018.3' into merge-2019.2 2019-01-22 09:20:42 -08:00
Erik Johnson
a6a9040e50
Merge pull request #51179 from terminalmage/fix-regex-chars 
Fix possible oversight in nodegroup modifications
 2019-01-22 06:50:48 -06:00
Daniel Wozniak
d5acd5bc9c
Merge pull request #51170 from dwoz/issue51158 
Honor roster system for ssh orchestrations
 2019-01-19 16:16:05 -07:00
Pedro Algarvio
6dd8e40266 Update pytest requirements 2019-01-19 18:38:44 +00:00
Pedro Algarvio
00a7ba0696 Move all of PyTest requirements to its own requiremnts file 2019-01-19 18:38:44 +00:00
Pedro Algarvio
5543a53215 Update pytest requirements 2019-01-19 18:37:52 +00:00
Pedro Algarvio
f958df5c2e Move all of PyTest requirements to its own requiremnts file 2019-01-19 18:37:52 +00:00
Gareth J. Greenaway
8f8ebbc227
Merge pull request #51226 from garethgreenaway/51195_handle_spaces_in_fstab_opts 
[2018.3] Handle spaces in fstab opts, similar fix to #39593
 2019-01-18 17:30:58 -08:00
Gareth J. Greenaway
1902ce83a7
Merge branch '2018.3' into 51195_handle_spaces_in_fstab_opts 2019-01-18 15:03:12 -08:00
Gareth J. Greenaway
e3a9e99320
Merge pull request #51233 from Ch3LL/bp-51105 
Backport #51105 to 2018.3
 2019-01-18 14:44:32 -08:00
Gareth J. Greenaway
0ccd5c37bb
Merge pull request #51221 from Ch3LL/bp-50540 
Backport #50538 into 2019.2
 2019-01-18 14:42:35 -08:00
Gareth J. Greenaway
223e7c0457
Merge branch '2019.2' into bp-50540 2019-01-18 12:52:01 -08:00
Gareth J. Greenaway
3edaf18cc8
Merge pull request #51232 from Ch3LL/merge-2019.2 
[2019.2] Merge forward from 2018.3 to 2019.2
 2019-01-18 12:51:34 -08:00
Gareth J. Greenaway
3c4b24345f
Merge branch '2019.2' into bp-50540 2019-01-18 11:51:59 -08:00
Gareth J. Greenaway
eef49e8999
Merge branch '2018.3' into bp-51105 2019-01-18 11:50:41 -08:00
Gareth J. Greenaway
e53e9b16b3
Merge pull request #51230 from Ch3LL/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-01-18 11:50:09 -08:00
Megan Wilhite
3b966f3ba5
Merge branch '2019.2' into merge-2019.2 2019-01-18 14:47:57 -05:00
Megan Wilhite
e6ab913455
Merge pull request #51234 from KChandrashekhar/2019.2-docs 
Added a note in Release notes about py 2.7 EOL
 2019-01-18 10:53:50 -05:00
Kavya Chandrashekhar
e4afc814e1 Addressing Megan's comment to fix the py2.7 deprecation message in release notes 2019-01-17 17:05:57 -07:00
Kavya Chandrashekhar
8ec0296986 Added a note in Release notes about py 2.7 EOL 2019-01-17 15:39:32 -07:00
Gareth J. Greenaway
c3520aa006
Accounting for when permissions are not returned from file.check_perms, eg. windows systems. 2019-01-17 17:32:58 -05:00
Gareth J. Greenaway
cd80548e79
When test=True and there are permissions changes, report it. 2019-01-17 17:31:23 -05:00
Ch3LL
ffe23fa258
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - salt/cloud/clouds/azurearm.py
  - salt/minion.py
  - salt/utils/network.py
 2019-01-17 17:11:00 -05:00
Megan Wilhite
644ef8c9d0
Merge pull request #51198 from Ch3LL/merge-2019.2-rc 
[2019.2] Merge forward from 2019.2.0.rc1 to 2019.2
 2019-01-17 16:23:33 -05:00
Ch3LL
0ef76755db
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/capirca_acl.py
 2019-01-17 16:11:12 -05:00
Gareth J. Greenaway
89345eb1ab
Handle spaces in fstab opts, similar fix to #39593 2019-01-17 12:06:34 -08:00
Daniel Wozniak
26008ef26c
Merge pull request #51212 from sathieu/file_roots_slash 
Allow slashes in file_roots envs.
 2019-01-17 10:29:17 -07:00
Jorge Schrauwen
3f61e77c45
Fix pdbedit module on samba 4.9 (Fixes #50538) 2019-01-17 11:49:34 -05:00
Mathieu Parent
b769f18085
Allow slash in file_roots envs 
Fixes: #51211
 2019-01-17 17:03:38 +01:00
Mathieu Parent
f9437e2590
Test for file_roots envs with slash leads to "No such file or directory" 
See #51211.

2019-01-08 09:57:23,653 [salt.master      :1795][ERROR   ][28091] Error in function _file_list:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/master.py", line 1788, in run_func
    ret = getattr(self, func)(load)
  File "/usr/lib/python2.7/dist-packages/salt/utils/decorators/__init__.py", line 594, in wrapped
    **salt.utils.data.decode_dict(kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 752, in file_list
    ret.update(self.servers[fstr](load))
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 422, in file_list
    return _file_lists(load, 'files')
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 310, in _file_lists
    __opts__, form, list_cache, w_lock
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 122, in check_file_list_cache
    if not os.path.isfile(list_cache) and _lock_cache(w_lock):
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 56, in _lock_cache
    os.mkdir(w_lock)
OSError: [Errno 2] No such file or directory: '/var/cache/salt/master/file_lists/roots/.foo/bar.w'
 2019-01-17 17:03:33 +01:00
Shane Lee
5916282144
Merge pull request #51209 from garethgreenaway/bp-51124 
[2018.3] Back-port PR #51124 to 2018.3
 2019-01-17 06:28:31 -07:00
Ch3LL
82acce47cd
Handle encoding when opening file for both py2/py3 
Conflicts:
	setup.py
 2019-01-16 19:09:25 -08:00
Ch3LL
810c6119ec
Merge branch '2019.2.0.rc1' into 2019.2 2019-01-16 16:38:32 -05:00
Daniel A. Wozniak
b69c002e68
Fix saltmod roster test 2019-01-16 11:20:05 -07:00
Daniel A. Wozniak
2594f246e5
Roster defines the roster system not a file 2019-01-16 11:18:41 -07:00
Daniel Wozniak
094bd33279
Merge pull request #51184 from twangboy/fix_auditpol 
Fix win_lgpo_auditpol salt util on Windows
 2019-01-16 11:08:00 -07:00
Daniel Wozniak
ac719226c0
Merge pull request #51191 from Ch3LL/bp-50918 
Backport #50918 into 2018.3
 2019-01-16 11:02:18 -07:00
Daniel Wozniak
1dc57094c2
Merge pull request #51194 from terminalmage/fix-py3-incompatibility 
Fix Python 3 incompatibility in EC2 salt-cloud driver
 2019-01-16 11:01:33 -07:00
Erik Johnson
734db2f686
Fix Python 3 incompatibility in EC2 salt-cloud driver 2019-01-16 10:15:28 -06:00
twangboy
7300d84d54
Skip debian tests on Windows 2019-01-16 09:31:37 -05:00
twangboy
4622433f84
Fix test_debian_ip on Windows 2019-01-16 09:31:33 -05:00
twangboy
2e68d35678
directly call cmd.run_all 
Apparently, you can't always use __salt__ in a util
 2019-01-15 18:09:36 -07:00
Erik Johnson
9951b8dcf1
Fix possible oversight in nodegroup modifications 
b3e2f38 enhanced nodegroup matching to allow sequences. However, the
list of regex special characters appears to have been improperly
formatted.
 2019-01-15 13:17:26 -06:00
Daniel Wozniak
e7f53a3df0
Merge pull request #51144 from jgleissner/2018.3-azurearm-py3 
2018.3 azurearm py3
 2019-01-15 09:46:34 -07:00
Daniel Wozniak
1206f92357
Merge pull request #51171 from twangboy/fix_crypt 
Add random sleep time to avoid overloading Windows
 2019-01-15 09:45:32 -07:00
Daniel Wozniak
a96deed641
Merge pull request #51174 from jpsv/2018.3 
Update OpsGenie to use their V2 API (2018.3)
 2019-01-15 09:44:53 -07:00
Daniel Wozniak
563d4875b8
Merge pull request #51010 from amendlik/ldap-groups 
Allow unauthenticated bind for listing LDAP groups
 2019-01-15 09:43:41 -07:00
Daniel Wozniak
6dc375226d
Merge pull request #51112 from s0undt3ch/2018.3 
[2018.3] Update to salt-bootstrap v2019.01.08
 2019-01-15 09:42:08 -07:00
Daniel Wozniak
4a12c5fa91
Merge pull request #50852 from mirceaulinic/fix-capirca 
Improve the Capirca and related modules for ACL config generation
 2019-01-15 09:41:00 -07:00
Daniel Wozniak
3f4759b8bf
Merge pull request #50923 from astronouth7303/patch-2 
Document {% include %}
 2019-01-15 09:39:11 -07:00