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
76,615 Commits 24 Branches 182 Tags 341 MiB
0da4c46b68
Commit Graph

76615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
0da4c46b68 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/utils/__init__.py
  - salt/utils/gitfs.py
  - tests/unit/modules/ssh_test.py
 2017-03-31 09:59:59 -06:00
Pedro Algarvio
8617be9c6d Merge pull request #40443 from gtmanfred/sshlog 
prepend ssh_log_file with root_dir
 2017-03-31 10:23:45 +01:00
Mike Place
c26f4cc76c Merge pull request #40371 from terminalmage/pr-40344 
Fix path handling for masterless gitfs on Windows
 2017-03-30 16:36:20 -06:00
Mike Place
132d8b7b88 Merge pull request #40376 from nmadhok/2016.11 
Backporting changes in vmware cloud driver from develop branch to 2016.11 branch
 2017-03-30 16:35:12 -06:00
Mike Place
df9df82959 Merge pull request #40379 from rallytime/tests-for-39855 
Create a unit test for the _replace_auth_key function in the ssh module
 2017-03-30 16:33:18 -06:00
Mike Place
dfaa670b66 Merge pull request #40387 from redbaron4/fix-39692 
More complete fix for 39692
 2017-03-30 16:29:05 -06:00
Mike Place
313d21626f Merge pull request #40404 from roaldnefs/fix-djangomod-loaddata 
Fix for fixtures in the djangomod module
 2017-03-30 16:26:08 -06:00
Mike Place
5379899442 Merge pull request #40416 from lorengordon/win-file-funcs 
Adds some missing file functions on Windows
 2017-03-30 16:22:43 -06:00
Mike Place
1f5d6b88f9 Merge pull request #40418 from lorengordon/close-temp-file 
Closes handle to temporary file before returning the path
 2017-03-30 16:22:02 -06:00
Mike Place
5c78d55eab Merge pull request #40430 from twangboy/fix_virtual 
Fix logic for __virtual__ in win_dsc and win_psget
 2017-03-30 16:06:15 -06:00
Daniel Wallace
7f6046deec prepend ssh_log_file with root_dir 2017-03-30 16:55:15 -05:00
Mike Place
b855f29928 Merge pull request #40431 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-30 15:37:39 -06:00
Roald Nefs
92285cb045 Fix for fixtures in the djangomod module 
Fixes #7287
 2017-03-30 22:13:21 +02:00
rallytime
d5576d75e7 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/crypt.py
 2017-03-30 12:21:44 -06:00
twangboy
08e95ce4f0 Add logging on __virtual__ failures 2017-03-30 12:01:55 -06:00
Nicole Thomas
b6770fd81f Merge pull request #40407 from aesdana/fix_rabbitmq_version_check 
Added split to cut off debian_revision from rabbitmq-server version
 2017-03-30 11:53:03 -06:00
Nicole Thomas
d4fb45d9f8 Merge pull request #40424 from terminalmage/fix-open-filehandle 
Fix open filehandles
 2017-03-30 11:51:20 -06:00
twangboy
43ecb1a597 Fix logic for __virtual__ 2017-03-30 11:43:18 -06:00
Erik Johnson
66251263cf Fix open filehandles 
This fixes two cases of filehandles being left open by failing to use a
with clause.
 2017-03-30 11:10:43 -05:00
Loren Gordon
7baf2809cf Closes handle to temporary file before returning the path 
Fixes #40417
 2017-03-30 10:29:06 -04:00
Loren Gordon
8edaf25e10 Adds some missing file functions on Windows 2017-03-30 09:38:00 -04:00
Dheeraj
77a40a0c44 Lint fixes 2017-03-30 10:31:16 +05:30
Dheeraj
8c1adfafd5 More complete fix for 39692 
The existing fix did not work if the profile name itself had a dash `-`.
For example - `virtual-guest`. This commit fixes that by using `split('- ')`
rather than `split('-')`. This commit also provides two simple tests for the
`list_()` function to emulate behaviour of both old and new tuned-adm versions

Fixes #39692
 2017-03-30 10:31:16 +05:30
Nitin Madhok
dd62310941 Adding unit tests for vmware_test 2017-03-30 00:54:57 -04:00
Nitin Madhok
36edf0af64 Add additional VMware related exceptions 2017-03-30 00:54:31 -04:00
Nitin Madhok
034ef30f7c Remove old vmware unit tests 2017-03-30 00:53:09 -04:00
Elena Konoreva
4c0763fa2f Added split to cut off debian_revision from rabbitmq-server version 
Fixes #40396
 2017-03-30 02:10:40 +03:00
Nicole Thomas
7d900d31ea Merge pull request #40401 from roaldnefs/fix-doc-faq 
fix Ubuntu notation in docs/faq.rst
 2017-03-29 14:28:30 -06:00
Nicole Thomas
70a3f963ec Merge pull request #40390 from rallytime/bp-37795 
Back-port #37795 to 2016.11
 2017-03-29 13:05:11 -06:00
Nicole Thomas
8708096365 Merge pull request #40399 from terminalmage/docker-py_version 
Add docker-py version to the versions report
 2017-03-29 12:39:25 -06:00
Roald Nefs
21f161fecc fix Ubuntu notation in docs/faq.rst 
Fixed Ubuntu notation in docs/faq.rst: changed Ununtu to Ubuntu.
 2017-03-29 20:09:55 +02:00
Erik Johnson
f8fbfff7dc Merge pull request #40395 from rallytime/catch-attribute-error-docker-test 
Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed
 2017-03-29 12:47:10 -05:00
Erik Johnson
14c6575655 Add docker-py version to the versions report 2017-03-29 12:06:03 -05:00
Nicole Thomas
ff1266b3a6 Merge pull request #40391 from Ch3LL/2016.3.7_release_notes 
initial commit of the 2016.3.7 release notes
 2017-03-29 10:37:26 -06:00
rallytime
99c8dcc18e Handle AttributeError for dockerng_mod.docker attempt fails and docker is installed 
When we hit that attribute error, we need to set the docker version
variable to a tuple starting with 0 so we can use it in other test
comparisons. If docker is installed, but at a lower version, we will
see this attribute error.

Fixes the test failure on the 2016.11 branch on CentOS 6 VMs.
 2017-03-29 10:28:51 -06:00
Ch3LL
f532ec5288 initial 2016.3.7 release notes 2017-03-29 09:34:03 -06:00
Nicole Thomas
1ba15577bd Pylint fix 
Also switched the arg order in the format call to make it easier to determine which option is referenced where.
 2017-03-29 08:54:32 -06:00
Paul Miller
ec65924659 please tell me where is the "error: 'dict' object has no attribute 'seek'" ?? 2017-03-29 08:54:32 -06:00
rallytime
96259d6c63 Lint fix 2017-03-28 17:12:56 -06:00
Nicole Thomas
d7d3d68035 Merge pull request #40362 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-28 16:50:31 -06:00
Nicole Thomas
2febd05896 Merge pull request #40372 from zer0def/pip-cache-fixes 
Fixes related to cache directory argument changes in pip>=6.
 2017-03-28 16:48:40 -06:00
rallytime
4f7ac1431e Create a unit test for the _replace_auth_key function in the ssh module 
References Pull Request #39855
 2017-03-28 16:27:53 -06:00
Nitin Madhok
7c144888da Backporting changes in vmware cloud driver from develop branch to 2016.11 branch 2017-03-28 16:29:58 -04:00
Erik Johnson
a8bcaa73d7 Force use of posixpath when joining salt fileserver paths in gitfs 2017-03-28 14:20:21 -05:00
Erik Johnson
cafa08d8e0 Add ability for salt.utils.path_join to force the use of posixpath 
Also remove unused and unnecessary behavior from this function when the
first path component is of single length. An empty first parameter to
this function will normalze to "." and result in an incorrectly-joined
result.
 2017-03-28 14:18:29 -05:00
Nicole Thomas
96bf9427b0 Merge pull request #40368 from Ch3LL/bump_version_3 
[2016.3] Bump previous version to 2016.3.6
 2017-03-28 12:51:01 -06:00
Nicole Thomas
6162698c87 Merge pull request #40369 from Ch3LL/bump_version_11 
[2016.11] Bump previous version to 2016.3.6
 2017-03-28 12:50:39 -06:00
Ch3LL
7597d96edb [2016.11] Bump previous version to 2016.3.6 2017-03-28 12:39:45 -06:00
Ch3LL
a02fa7dd1f [2016.3] Bump previous version to 2016.3.6 2017-03-28 12:38:45 -06:00
rallytime
4f1543c2a1 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-03-28 10:29:41 -06:00