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
76,632 Commits 24 Branches 182 Tags 341 MiB
85b9bb4072
Commit Graph

76632 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Erik Johnson
16e19ea860 Merge branch 'thatch45-rand_m_doc' into 2016.11 2017-04-04 00:27:15 -05:00
Thomas S Hatch
6279f7c120 fix do to pre correct on python randome function 2017-04-03 14:50:07 -06:00
Thomas S Hatch
66b9515af7 Fix up the doc for failover clarity 2017-04-03 13:24:56 -06:00
Nicole Thomas
02a1f642ab Merge pull request #40495 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-03 12:36:15 -06:00
rallytime
8111909bb1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/master_tops/index.rst
  - salt/runners/saltutil.py
 2017-04-03 10:41:01 -06:00
Pedro Algarvio
ac82972cb3 Merge pull request #40466 from dmurphy18/aix_status 
Support for execution module status on AIX
 2017-04-01 01:28:50 +01:00
Mike Place
fdb0250c95 Merge pull request #40429 from DSRCorporation/features/39275_memcache 
MemCache - a minion data cache booster.
 2017-03-31 14:20:59 -06:00
David Murphy
7c0b30d9a4 Support for AIX 2017-03-31 14:17:37 -06:00
Mike Place
31d4e6949c Merge pull request #40442 from gtmanfred/salt-ssh 
allow file_client to figure out cachedir
 2017-03-31 14:14:27 -06:00
Mike Place
3d45a004b0 Merge pull request #40427 from terminalmage/clarify-master-tops-docs 
Clarify the master_tops documentation
 2017-03-31 14:02:59 -06:00
Mike Place
bda781d8f9 Grammar fix 2017-03-31 14:02:48 -06:00
Nicole Thomas
0cfcd188a9 Merge pull request #40456 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-03-31 11:51:10 -06:00
Dmitry Kuzmenko
4475d1757d In-memory minion data cache. 2017-03-31 19:38:04 +03:00
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
Daniel Wallace
8367735063 allow file_client to figure out cachedir 
We do not need to specify the entire path here.  _cache_loc in salt.fileclient
will do that for us.  If we specify cachedir here, it will use the
/var/tmp/*/running_data/var/cache path which we do not want to use when on the
master.

This is intelligent enough to use the /var/tmp path on the minion and a
/var/cache/salt/master type path on the master.

Fixes #38458
 2017-03-30 19:25:55 -05: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
0d7b0c4ef0 Improve the master_tops documentation 2017-03-30 11:56:15 -05:00
Erik Johnson
d27340a9f2 Add saltutil.sync_tops runner func 2017-03-30 11:55:59 -05: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