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
92,425 Commits 24 Branches 182 Tags 341 MiB
76663d6aa7
Commit Graph

92425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bo Maryniuk
76663d6aa7 Simplify shell cmd to get the version on Python 2.x 2018-04-06 17:38:11 +02:00
Bo Maryniuk
606a9146a6 Bail-out immediately if <2.6 version detected 2018-04-06 17:38:11 +02:00
Bo Maryniuk
80b8a4f60c Flatten error message string 2018-04-06 17:38:11 +02:00
Michael Calmer
08f556c7c3 fix searching for python versions 2018-04-06 17:38:11 +02:00
Bo Maryniuk
70e7a7006f Use common shared directory for compatible libraries 2018-04-06 17:38:11 +02:00
Bo Maryniuk
d5f6777fc4 Add proper error handler, unmuting exceptions during top collection 2018-04-06 17:38:11 +02:00
Bo Maryniuk
7fc1dbbce3 Add basic shareable module classifier 2018-04-06 17:38:10 +02:00
Michael Calmer
c822ba2ed0 find working executable 2018-04-06 17:38:10 +02:00
Bo Maryniuk
18844163ae Simplify tops gathering, bugfix alternative to Py2 2018-04-06 17:38:10 +02:00
Bo Maryniuk
d3dcb5c19a Add external shell-callable function to collect tops 2018-04-06 17:38:10 +02:00
Bo Maryniuk
22bcda5e86 Refactor archive creation flow 2018-04-06 17:38:10 +02:00
Bo Maryniuk
819281fdcb Reset default compression, if unknown is passed 2018-04-06 17:38:10 +02:00
Bo Maryniuk
cf205af99a Update log debug message for tops collector 2018-04-06 17:38:10 +02:00
Bo Maryniuk
d7bb3b1735 Remove pre-caution 2018-04-06 17:38:10 +02:00
Bo Maryniuk
1f1fa56734 Update call script 2018-04-06 17:38:10 +02:00
Bo Maryniuk
605cf71f88 Add logging to the get_tops 2018-04-06 17:38:10 +02:00
Bo Maryniuk
5e16f67cb2 Refactor get_tops collector 2018-04-06 17:38:10 +02:00
Bo Maryniuk
cdc6748608 Remove unnecessary noise in imports 2018-04-06 17:38:10 +02:00
Bo Maryniuk
3fe70e8062 Add docstring to get_tops 2018-04-06 17:38:10 +02:00
Bo Maryniuk
2075cbaa8e Bugfix: get a proper option for CLI and opts of wiping the tmp 2018-04-06 17:38:10 +02:00
Bo Maryniuk
ca27af618e Reset time at thin unpack 2018-04-06 17:38:10 +02:00
Bo Maryniuk
b6fb37d6a8 Bugfix: prevent partial fileset removal in /tmp 2018-04-05 16:50:39 +02:00
Bo Maryniuk
0a17da6fa7 Handle non-directory on the /tmp 2018-04-05 16:50:39 +02:00
Michael Calmer
52151bd70b salt-ssh: allow server and client to run different python major version 2018-04-05 16:50:39 +02:00
Bo Maryniuk
3050b3a8cf Bugfix: crashes when OPTIONS.saltdir is a file 2018-04-05 16:50:39 +02:00
Bo Maryniuk
e651278015 Fix PEP8 2018-04-05 16:50:39 +02:00
Nicole Thomas
9ab8c26adf
Merge pull request #46461 from cbosdo/develop 
Add engine relaying libvirt events
 2018-04-05 09:27:55 -04:00
Cedric Bosdonnat
d386daa0af
Merge branch 'develop' into develop 2018-04-05 08:48:17 +02:00
Nicole Thomas
648494671b
Merge pull request #46874 from johnj/develop 
Use bytestrings for PY3 compatibility when running setsockopt for zmq.SUBSCRIBE
 2018-04-04 18:03:15 -04:00
Nicole Thomas
2a84c9595a
Merge pull request #46448 from ogd-software/allow_failhard_override 
Made state-level failhard override global failhard.
 2018-04-04 17:12:00 -04:00
Nicole Thomas
bd88287504
Merge pull request #46683 from homolkad/libvirt_create_network_pool 
Add create network and pool in libvirt
 2018-04-04 17:09:21 -04:00
Mike Place
51d424e9cb
Merge pull request #46090 from rongzeng54/fix_for_initscript 
modify _get_pid by pidfile
 2018-04-04 16:05:52 -05:00
Mike Place
be7c75662f
Merge pull request #46231 from pcdummy/add_lxd_support 
Add lxd module and states
 2018-04-04 15:50:48 -05:00
Nicole Thomas
50a414fd9a
Merge pull request #46506 from kyrias/sd-test 
serverdensity_device: Add support for test=True
 2018-04-04 16:48:39 -04:00
Nicole Thomas
020fac2370
Merge pull request #46685 from fredprod/add_save_load_zabbix_returner 
Add save_load in zabbix returner
 2018-04-04 16:35:22 -04:00
Nicole Thomas
cf3c97e317
Merge pull request #46852 from jasperla/smartos/nictag_mac 
fix creating a nic tag on a link with double 0 in the MAC
 2018-04-04 16:27:19 -04:00
John Jawed
81da4e7f04 #43499, zmq setsockopt need to adapt python3 2018-04-04 12:21:57 -07:00
Nicole Thomas
d6f54d18ac
Merge branch 'develop' into libvirt_create_network_pool 2018-04-04 15:05:39 -04:00
Nicole Thomas
e36faac176
Merge pull request #46801 from yagnik/jenkins-mod 
rename jenkins to jenkinsmod
 2018-04-04 14:37:22 -04:00
Nicole Thomas
2ffc3fd472
Merge branch 'develop' into sd-test 2018-04-04 14:32:56 -04:00
Nicole Thomas
bbbad49e86
Merge pull request #46866 from rallytime/fix-46860 
Fix up bad merge conflict resolution
 2018-04-04 14:06:00 -04:00
Jasper Lievisse Adriaanse
ab53d2ceac
fix creating a nic tag on a link with double 0 in the MAC 
otherwise we get a message like '12:34:00:56:78:90 is not present on this system.'
as dladm prints the '00' as '0' and we fail to correctly identify
the existing interface.

Fix a linting issue while here
 2018-04-04 19:58:46 +02:00
Nicole Thomas
9f49dbab5d
Merge pull request #46849 from jasperla/smartos/nictag_mtu 
Unbreak creating etherstubs on SmartOS
 2018-04-04 13:55:28 -04:00
Erik Johnson
8a46645d38
Merge pull request #46863 from TamCore/patch-1 
fixed top function which was broken since commit 002aa88a97
 2018-04-04 10:14:44 -05:00
Nicole Thomas
c998e78570
Merge pull request #46833 from samilaine/pillar-include-missing-documentation 
Document the ignore_missing parameter for the pillar top file.
 2018-04-04 10:50:42 -04:00
rallytime
7660304262
Fix up bad merge conflict resolution 
These snuck in during a merge forward. Usually I check for `<<<<<` and `>>>>>`
lines, but I must have missed that check on the merge forward for this files. It
wasn't caught in tests since all of the merge conflict lines are in docs.

Fixes #46860
 2018-04-04 10:25:13 -04:00
Nicole Thomas
92328dc0ed
Merge pull request #46724 from StackPointCloud/reserve_public_ip 
Reserve public IP block
 2018-04-04 09:57:43 -04:00
Philipp Born
3655569322
fixed top function which was broken since commit 002aa88a97 
```
2018-04-04 12:49:51,312 [salt.daemons.masterapi:540 ][ERROR   ][11108] Top function ext_nodes failed with error 'int' object has no attribute 'communicate' for minion random.system.local
```
 2018-04-04 13:04:17 +02:00
Herbert
a74c90584f
Merge branch 'develop' into allow_failhard_override 2018-04-04 10:40:52 +02:00
Sami Laine
2e2c32e6ac Typofix. 2018-04-04 10:39:18 +03:00