valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,597 Commits 24 Branches 182 Tags 341 MiB
ea6d5259b3
Commit Graph

86597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandru Bleotu
2d2f094810 Merge branch 'develop' into dvs_states-gh 2017-09-25 11:22:45 +01:00
Heghedus Razvan
19da1000b4 test_nilrt_ip: Fix set_static_all test 
The nameservers needs to be specified only by ip address.

Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2017-09-25 12:49:46 +03:00
assaf shapira
07ef749174 Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-25 12:10:29 +03:00
assaf shapira
2c80ea54f4 more lint fixes 2017-09-25 12:06:48 +03:00
assafShapira
dc303c49b4 Merge branch 'develop' into develop 2017-09-25 11:34:46 +03:00
Sebastien Huber
78137c0860 Corrected custom port handling 
This pillar was only able to connect to a Postgres DB running on the default port (5432)
This commit extend this to a custom port
 2017-09-25 10:00:52 +02:00
Mike Place
68fa74e88f Merge pull request #43571 from nadvornik/raid_add 
Add missing devices to RAID array
 2017-09-24 19:54:10 -06:00
Mike Place
6bbd50c453 Merge pull request #43700 from rklaren/fix-libvirt-stderr-spam 
Ensure salt-cloud with libvirt provider does not write low level errors to stderr
 2017-09-24 19:47:25 -06:00
Mike Place
52bc418ff8 Merge pull request #43690 from bodhi-space/infra5292_fluent 
INFRA-5292 - add support to fluent logger for Graylog and GELF output formats
 2017-09-24 19:30:22 -06:00
Mike Place
cae79d2020 Merge pull request #43699 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-24 19:27:17 -06:00
Mike Place
437ac03801 Merge pull request #43702 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-24 19:26:19 -06:00
Mike Place
f7df8ceb12 Merge pull request #43704 from garethgreenaway/monitor_user_and_time_in_btmp_and_wtmp 
Updates to btmp and wtmp beacons
 2017-09-24 19:25:47 -06:00
assaf shapira
3d59425cdf Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-24 17:35:23 +03:00
assaf shapira
7dee6e0a6e Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-24 17:34:46 +03:00
assaf shapira
a327ee9614 fix lint errors 2017-09-24 17:34:38 +03:00
assafShapira
86b0ec97de Merge branch 'develop' into develop 2017-09-24 17:24:15 +03:00
assaf shapira
fec005320d Merge branch 'develop' of https://github.com/assafShapira/salt into develop 2017-09-24 12:49:31 +03:00
assaf shapira
7ba690afaa added link to citrix SDK download 2017-09-24 12:49:11 +03:00
Wedge Jarrad
96c1ef48e6 Ignore retcode on call to grep in selinux.py module 
Fixes #43711

Returning an exit code of 1 is normal operation of grep when it does not
find a match. This will happen every time this function is called by
fcontext_policy_present to detirmine whether a selinux policy exists
before creating it. Ignoring the retcode will prevent it from emitting
an error when this happens.
 2017-09-23 17:38:51 -07:00
Damon Atkins
c7a652784a remove blank line at end of file 2017-09-23 13:56:50 +10:00
Damon Atkins
e97651d49b Merge branch '2017.7' into 2017.7_update_safe_filename_func 2017-09-23 13:54:11 +10:00
Alexandru Bleotu
847debab7a Fix failing storage and listdiffer tests 2017-09-22 17:50:09 -04:00
garethgreenaway
132b1b343b Merge branch '2017.7' into merge-2017.7 2017-09-22 14:38:23 -07:00
Alexandru Bleotu
6b574ec5da Return sorted added/removed/changed/unchanged keys in RecursiveDictDiffer so result is deterministic 2017-09-22 17:34:12 -04:00
Gareth J. Greenaway
db25b6500b Fixing one more import. 2017-09-22 14:27:55 -07:00
Gareth J. Greenaway
fb0b987d06 Adding some lines to disable the lint errors on import for salt.ext.six.moves. 2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
2c0bc35963 Fixing lint errors. 2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
ca3f77f81e Adding test_btmp_beacon. 2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
6fe02e3c6c Updating btmp & wtmp beacons to work with python3. Adding ability to fire alerts for specific users & specific times. Adding some unit tests for both. 2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
85f7549cb9 Adding the ability to monitoring logins by user & specific time ranges in the btmp & wtmp beacons 2017-09-22 14:24:31 -07:00
Shane Hathaway
ae035f6b4d Fixed the 'status.procs' and 'status.pid' functions for openvzhn environments. 
In openvzhn environments, running the 'ps' grain requires python_shell=True. This
may also be true of environments where the 'ps' grain has been customized.
 2017-09-22 15:05:47 -06:00
Ric Klaren
88530c4cb6 Lint fixes 2017-09-22 15:39:28 -05:00
Ric Klaren
235bec492e salt-cloud + libvirt: Mention Fedora 26 support 2017-09-22 15:39:28 -05:00
Ric Klaren
9aecf5f847 Remove stderr spam when using salt-cloud with libvirt 
Install error handler and redirect stderr output to debug log.
 2017-09-22 15:39:28 -05:00
Silvio Moioli
fd4194ade0 process_count_max: disable by default 2017-09-22 21:57:54 +02:00
Silvio Moioli
d53550de35 process_count_max: add unit test 2017-09-22 21:57:04 +02:00
Silvio Moioli
04ab9a6102 process_count_max: adapt existing unit tests 2017-09-22 21:57:04 +02:00
Silvio Moioli
4d181ea523 process_count_max: add defaults and documentation 2017-09-22 21:57:02 +02:00
Silvio Moioli
6baadf7a77 Introduce process_count_max minion configuration parameter 
This allows users to limit the number of processes or threads a minion
will start in response to published messages, prevents resource
exhaustion in case a high number of concurrent jobs is scheduled in a
short time.
 2017-09-22 21:56:26 +02:00
Nicole Thomas
d3db02e747 Merge branch 'develop' into add-rethinkdb-external-pillar 2017-09-22 15:39:06 -04:00
Mike Place
fc3489489e Merge pull request #43435 from blueyed/boto_elb-register-currently-deregistrating 
boto_elb.register_instances: do not skip instances being unregistered
 2017-09-22 13:36:24 -06:00
Mike Place
47cd8723c6 Merge pull request #43681 from terminalmage/issue38971-2017.7 
Backport the non-fileclient changes from PR 43518 to 2017.7
 2017-09-22 13:27:24 -06:00
Mike Place
93034ead24 Merge pull request #43337 from JoaquinVeira/patch-1 
Update zabbix_return.py
 2017-09-22 13:25:30 -06:00
Nicole Thomas
0a1c5185f5 Merge pull request #43687 from mkurtak/fix-43396 
yumpkg.py: install calls list_repo_pkgs only if wildcard is used in pkg name
 2017-09-22 15:23:17 -04:00
Nicole Thomas
ba1b45c4b9 Merge pull request #43527 from OrlandoArcapix/patch-1 
Update yumpkg.py
 2017-09-22 15:21:42 -04:00
Mike Place
3a79549af4 Merge pull request #43467 from DSRCorporation/bugs/43124_users_regex 
Bugs/43124 users regex
 2017-09-22 13:21:08 -06:00
Mike Place
3ad43a5a67 Merge pull request #43470 from alexbleotu/esxdatacenter-gh 
Fix to esxdatacenter proxy
 2017-09-22 13:18:54 -06:00
rallytime
03ce4d81b7
Reactor Test: Fix incorrect merge conflict resolution 2017-09-22 15:01:11 -04:00
Alexandru Bleotu
c1d3bda729 Added python/pyvmomi compatibility check to salt.modules.vsphere + removed reference to Python 2.6 2017-09-22 14:49:47 -04:00
Alexandru Bleotu
f0a813b126 Review changes 2017-09-22 14:35:23 -04:00