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
82,117 Commits 24 Branches 182 Tags 341 MiB
6e9e0714f0
Commit Graph

82117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
6e9e0714f0
Merge forward from 2016.11 to 2017 2017-06-21 14:51:02 -06:00
Mike Place
a25818b90b Merge pull request #41872 from DSRCorporation/bugs/py3_DiskTestCase 
Py3: test_disk fix: don't expect dict iteration order will be the same
 2017-06-21 12:09:57 -05:00
Mike Place
eea9cafba0 Merge pull request #41874 from DSRCorporation/bugs/py3_mdadm_test 
Py3 mdadm test
 2017-06-21 12:03:33 -05:00
Mike Place
ccd81ed047 Merge pull request #41859 from DSRCorporation/bugs/py3_tests_2017.7 
Py3 etcd unit test fix.
 2017-06-21 10:33:15 -05:00
Mike Place
278b5614d0 Merge pull request #41856 from meaksh/2017.7-suse-leftovers-part-two 
SUSE leftovers for 2017.7.0 RC
 2017-06-21 10:24:37 -05:00
Dmitry Kuzmenko
e1e8d96ef2 Removed unneeded import. 2017-06-21 18:08:44 +03:00
Dmitry Kuzmenko
1401b2d5ba Py3: mdadm test fix: don't expect kwargs iteration order 2017-06-21 15:45:55 +03:00
Dmitry Kuzmenko
127e48025a Py3: tests_disk fix: don't expect dict iteration order will be the same 2017-06-21 14:48:59 +03:00
Pablo Suárez Hernández
a3e9b5cdbe Fixes mocking error 2017-06-21 11:56:36 +01:00
Dmitry Kuzmenko
596ab0421d Py3: pass Exception to side effect friendly for both mock<1.1 and mock>=1.1 2017-06-21 12:46:46 +03:00
Pablo Suárez Hernández
6eea8179ad Pylint fixes 2017-06-21 10:09:11 +01:00
Pablo Suárez Hernández
686c45b8ab Fix buggy test 2017-06-21 09:32:01 +01:00
Mike Place
3c8dee0707 Merge pull request #41864 from garethgreenaway/2017_7_beacon_hotfix 
Quick fix for beacons in 2017.7
 2017-06-20 18:39:11 -05:00
Mike Place
955d5b710d Merge pull request #41865 from twangboy/fix_coverage_check 
Don't run coverage if not admin
 2017-06-20 18:38:54 -05:00
twangboy
a2c4ff0ebc Don't run coverage it not admin 2017-06-20 15:32:55 -06:00
Mike Place
eb0e40a867 Merge pull request #41014 from cachedout/issue_40937 
Ensure strings in decorator
 2017-06-20 15:36:00 -05:00
Gareth J. Greenaway
94ce954441 Reverting a change in 2017.7 that causes the beacons are expecting dictionaries as there configuration to no longer function. Fixing this for the nitrogen release, then addressing the original issue for Oxygen 2017-06-20 13:35:00 -07:00
Mike Place
60ea0ba85b Lint fix 2017-06-20 14:13:25 -06:00
Mike Place
4f8714037d Merge pull request #41851 from DSRCorporation/bugs/py3_tests_nitrogen 
Minor Py3 related tests fixes.
 2017-06-20 15:11:43 -05:00
Dmitry Kuzmenko
c25ebe3a6e Py3: fix test for Py34. Fixed the etcd util error case handling. 2017-06-20 21:47:51 +03:00
Mike Place
f04888d88f Remove unused import 2017-06-20 12:15:50 -06:00
Mike Place
4140c639ae
Handle review comments 2017-06-20 11:30:57 -06:00
Dmitry Kuzmenko
ea1a351f5f Code review fixup. 2017-06-20 20:26:58 +03:00
Mike Place
594b7631f7 Merge pull request #41850 from DSRCorporation/bugs/py3_tests_2017.7 
Py3 tests fix for 2017.7
 2017-06-20 12:17:28 -05:00
Mike Place
87a252fda7 Merge pull request #41852 from Ch3LL/rn_2017_py 
Update 2017 Release Notes with Python Messages
 2017-06-20 12:17:04 -05:00
Pablo Suárez Hernández
11568af6f5 Replace missing 'Oxygen' version tags to '2017.7.0' 2017-06-20 17:41:35 +01:00
Pablo Suárez Hernández
30b12da58b Enables salt-minion watchdog on init.d script for sysV 2017-06-20 17:28:40 +01:00
Pablo Suárez Hernández
4257ba5af9 Adding salt-minion watchdog for sysV systems (rhel6 and sles11) 2017-06-20 17:28:40 +01:00
Michael Calmer
db295f6f06 special salt-minion.service file for rhel7 2017-06-20 17:28:39 +01:00
Michael Calmer
24bad5b078 translate variable arguments if they contain hidden keywords (bsc#1025896) 
- includes a test
 2017-06-20 17:28:39 +01:00
Bo Maryniuk
a27415c4cc Add YUM plugin 
* Add plugin for Yum-Salt integration
* Add configuration for the yumnotify plugin
* Fixes wrong 'enabled' opts for yumnotify plugin
 2017-06-20 17:28:39 +01:00
Silvio Moioli
22d884f478 Avoid failures on SLES 12 SP2 because of new systemd TaskMax limit (bsc#985112) 2017-06-20 17:28:39 +01:00
Michael Calmer
8c89378b0d Run salt-api as user salt (bsc#990029) 2017-06-20 17:28:38 +01:00
Bo Maryniuk
1c817bb6c9 Add zypp-notify plugin 
* Add unit test to the libzypp drift detector plugin
 2017-06-20 17:18:31 +01:00
Klaus Kämpf
0cf36b487b Run salt master as dedicated salt user 
* Minion runs always as a root
 2017-06-20 17:13:00 +01:00
Klaus Kämpf
02b6d8ce42 tserong@suse.com -- We don't have python-systemd, so notify can't work 2017-06-20 17:09:14 +01:00
Mike Place
c702bf6cb2 Merge pull request #41855 from cachedout/version_locale 
List locale in versions_report
 2017-06-20 10:44:52 -05:00
Mike Place
c3c0930a2d
List locale in versions_report 2017-06-20 09:43:47 -06:00
Mike Place
f720a849ba Merge pull request #41795 from isbm/isbm-suse-upstream-leftovers 
Things, that didn't made to 2017.7 for some reasons
 2017-06-20 09:28:21 -05:00
Dmitry Kuzmenko
44e2ad24df Don't fail if can't create a socket to check master connection. 
This happens for instance if ipv6 is disabled in the kernel but
/etc/hosts contains both ipv4 and ipv6 records for 'localhost'.
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
ea656e92c6 Py3: Disabled augeas test that segfaults the test suite. 
Because of a bug in python-augeas:
https://github.com/hercules-team/python-augeas/issues/30
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
5a1bdd368e Py3: minor tests updates 
Correct skipping explanation and correctly disable by proper conditions.
BTW, mysql works on Py3. There's a port of python-mysql and test passes.
 2017-06-20 16:59:38 +03:00
Dmitry Kuzmenko
2cff18e2ef Py3: fix boto elb test 2017-06-20 16:59:38 +03:00
Ch3LL
75f93edff2 Update 2017 Release Notes with Python Messages 2017-06-20 09:55:13 -04:00
Dmitry Kuzmenko
9de940d3d3 Py3: don't use mock.assert_called_once implemented in 3.6. 2017-06-20 16:34:22 +03:00
Dmitry Kuzmenko
e079b4657a Py3: PyDSL test fix. Ignore kwargs order. 2017-06-20 14:29:00 +03:00
Bo Maryniuk
3357dd6f22 Replace 'Nitrogen' as '2017.7.0' version 2017-06-20 11:11:10 +02:00
Mike Place
a4195f5246 Merge pull request #41841 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-06-19 18:01:11 -05:00
Bo Maryniuk
7ca1ab5f03 Merge branch 'isbm-suse-upstream-leftovers' of github.com:isbm/salt into isbm-suse-upstream-leftovers 2017-06-20 00:26:35 +02:00
Bo Maryniuk
904d40d0bd Removing 'Oxygen' from the docstring 2017-06-20 00:23:50 +02:00