valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,191 Commits 24 Branches 182 Tags 341 MiB
8739cd62a8
Commit Graph

86191 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
8739cd62a8 Merge pull request #43726 from saltstack/revert-43688-develop 
Revert "Extend openscap module command parsing."
 2017-09-25 12:12:02 -04:00
Nicole Thomas
68e1bd99eb Revert "Extend openscap module command parsing." 2017-09-25 12:10:23 -04: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
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
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
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
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
93034ead24 Merge pull request #43337 from JoaquinVeira/patch-1 
Update zabbix_return.py
 2017-09-22 13:25:30 -06: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
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
Mike Place
15c6e69bc1 Merge pull request #43651 from bodhi-space/infra5461 
Re-opening https://github.com/saltstack/salt/pull/43642 which I deleted too soon
 2017-09-22 12:25:22 -06:00
Mike Place
75dd97ee50 Merge pull request #43645 from alexbleotu/cluster_states-gh 
VMware cluster states + dependencies
 2017-09-22 11:46:25 -06:00
Mike Place
7e3a6b92d5 Merge pull request #43518 from terminalmage/issue38971 
Reduce unnecessary file downloading in archive/file states
 2017-09-22 11:44:04 -06:00
Mike Place
522399b5c0 Merge branch 'develop' into infra5292_fluent 2017-09-22 11:37:31 -06:00
Mike Place
530a6bb2e7 Merge pull request #43698 from theredcat/elastic-timeout 
Add timeout option to elasticsearch execution module
 2017-09-22 11:30:14 -06:00
Nicole Thomas
c0bfa7a77c Merge pull request #43684 from rklaren/salt-cloud-libvirt-fix-python-warning 
salt-cloud libvirt updates
 2017-09-22 10:50:11 -04:00
Nicole Thomas
0ec22d48a0 Merge pull request #43688 from abergmann/develop 
Extend openscap module command parsing.
 2017-09-22 10:43:52 -04:00
Nicole Thomas
49bb3b0a52 Merge branch 'develop' into issue38971 2017-09-22 10:38:34 -04:00
Nicole Thomas
7448153154 Merge pull request #43691 from dmyerscough/fix-docstring-formatting 
Fix docstring code-blocks
 2017-09-22 10:34:51 -04:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
Nathan DELHAYE
25a1958304 Add timeout option to elasticsearch execution module 2017-09-22 15:49:44 +02:00
Joaquin Veira
43ded54132 Update zabbix_return.py 
corrected indentation and other suggestions by jenkins
 2017-09-22 11:43:44 +02:00
Tom Williams
f6a8a969a4 INFRA-5292 - we must please pylint ... 2017-09-22 05:19:51 -04:00
Vladimir Nadvornik
9d450f7737 Fix python3 compatibility 2017-09-22 10:24:11 +02:00
Damian Myerscough
012281dea2 Fix docstring code-blocks 2017-09-21 22:46:03 -07:00
Ric Klaren
b750c44224 Fix some lint warnings 2017-09-21 22:38:13 -05:00
Ric Klaren
7595f97488 Ensure libvirt does not write to stderr by itself 
Install error handler and redirect stderr output to debug log.
 2017-09-21 22:38:13 -05:00
Ric Klaren
ab0892c802 Fix fire_event for destroy 2017-09-21 22:38:13 -05:00
Ric Klaren
022a25e3fc Mention Fedora 26 support 2017-09-21 22:38:13 -05:00
Tom Williams
7f9a7e2857 INFRA-5292 - add support to fluent logger for Graylog and GELF output formats 2017-09-21 20:31:18 -04:00
Mike Place
e6dc4d64df Merge pull request #43314 from twangboy/win_fix_unit.utils.test_verify 
Fix `unit.utils.test_verify` for Windows
 2017-09-21 16:26:12 -06:00
Mike Place
d7b19ab64f Merge pull request #43686 from terminalmage/issue43383 
Make git_pillar runner return None when no changes are fetched
 2017-09-21 15:44:48 -06:00
Mike Place
426eb92474 Merge branch 'develop' into raid_add 2017-09-21 15:37:31 -06:00
Mike Place
9c585e052f Merge pull request #43683 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 30
 2017-09-21 14:58:36 -06:00
Alexander Bergmann
f5188cb886 Extend openscap module command parsing. 
This commit extends the cmd_pattern with unknown parts of the parsing
process. Otherwise it is not possible to customize the openscap XCCDF
execution with additional parameters like --remediate.
 2017-09-21 22:28:31 +02:00
Mike Place
ed22e0f2fd Merge pull request #43507 from rallytime/replace-utils-calls 
Update which and is_windows calls to use new paths
 2017-09-21 14:11:21 -06:00
Mike Place
ec34df2c27 Merge pull request #43680 from vernondcole/fix-salt.cache.Cache-default 
correct default value for salt.cache.Cache
 2017-09-21 14:09:35 -06:00
Mike Place
9fc0699613 Merge pull request #43511 from spenceation/panos/security-rule 
- Added get_security_rule function to PANOS execution module.
 2017-09-21 14:08:32 -06:00
Erik Johnson
7dcac84521 Make git_pillar runner return None when no changes are fetched 
This distinguishes cases in which no changes were fetched from those
when there were errors.
 2017-09-21 14:05:31 -05:00
Mike Place
310f826cc0 Merge pull request #43524 from kbespalov/develop 
[network.interface_ip] Correct handling of interfaces without IP
 2017-09-21 12:06:24 -06:00
Mike Place
99d9d784b1 Merge pull request #43530 from twangboy/win_fix_pkg.install 
Fixes removal of double-quotes by shlex_split in winrepo
 2017-09-21 12:04:47 -06:00
Nicole Thomas
4d50243971 Merge pull request #43544 from lyft/fix-boto3-util-pack-error 
Fix boto3 util pack error
 2017-09-21 14:04:09 -04:00
rallytime
100113726c
Reduce the number of days an issue is stale by 30 2017-09-21 13:18:07 -04:00