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
44,133 Commits 24 Branches 182 Tags 341 MiB
69d484d65d
Commit Graph

3513 Commits

Author SHA1 Message Date
rallytime
69d484d65d pylint fix 2015-01-07 00:57:50 +00:00
rallytime
f40affd5d9 Fix blockdev module unit tests 2015-01-06 23:00:12 +00:00
rallytime
ed3a34624c Fix djangomod.py integration test failures 2015-01-06 22:26:46 +00:00
Colton Myers
c5cdc575d0 Merge branch '2015.2' into merge-forward-develop 
Conflicts:
	salt/utils/reactor.py
	tests/jenkins-ng.py
 2015-01-06 14:16:15 -07:00
Colton Myers
56eae4783a Merge branch '2014.7' into merge-forward-2015.2 2015-01-06 13:33:18 -07:00
Nicole Thomas
83e451d392 Merge pull request #19401 from rallytime/test_fixes 
Pylint and psutil unit test fixes for 2014.7 branch
 2015-01-06 13:24:15 -07:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
rallytime
c105867720 namedtuple doesn't exist in psutil._compat in psutil 2.2.0 2015-01-06 12:08:31 -07:00
Mike Place
88f3477772 These were unused and causing weird recursion errors in unit tests 2015-01-06 11:22:32 -07:00
rallytime
73ef44dd9f Pylint fix for 2014.7 branch 2015-01-06 11:14:06 -07:00
Mike Place
170ce2a6f3 Merge pull request #19396 from cachedout/remove_unused_import_in_cp 
These were unused and causing weird recursion errors in unit tests
 2015-01-06 11:04:25 -07:00
Mike Place
c706ed279c These were unused and causing weird recursion errors in unit tests 2015-01-06 11:03:21 -07:00
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00:00
Thomas S Hatch
00e9686488 Merge pull request #19303 from cachedout/batch_ckminions 
Batch ckminions
 2015-01-06 10:37:42 -07:00
Thomas S Hatch
a7a5362798 Merge pull request #19370 from Seveland12/develop 
fixed typo in tests/consist.py
 2015-01-06 10:22:55 -07:00
Thomas S Hatch
41bef7771e Merge pull request #19356 from rallytime/bp-19340 
Backport #19340 to 2014.7
 2015-01-06 10:17:49 -07:00
Thomas S Hatch
e31cd4208a Merge pull request #19352 from rallytime/bp-19280 
Backport #19280 to 2014.7
 2015-01-06 10:16:25 -07:00
Thomas S Hatch
b01ac59df6 fix bad lint error 2015-01-06 10:13:47 -07:00
Thomas S Hatch
ab0b432d94 Merge branch 'apache_unit_test' of https://github.com/jayeshka/salt into jayeshka-apache_unit_test 2015-01-06 10:11:50 -07:00
sjwehry
8eb6de4e09 fixed typo in tests/consist.py 
fixed typo in tests/consist.py
 2015-01-05 20:01:16 -05:00
rallytime
f6243f0b80 Fix the test in the correct place... 2015-01-05 15:36:45 -07:00
rallytime
4a62c2b860 Fix pip state test failure 2015-01-05 15:20:18 -07:00
Nitin Madhok
f20f899b34 Changing return to match zpool list instead of zfs list 2015-01-05 14:05:55 -07:00
nmadhok
44454a3687 Replacing zfs with zpool 2015-01-05 14:05:55 -07:00
nmadhok
8670e399ce Adding unit tests for salt.modules.zpool 2015-01-05 14:05:55 -07:00
Mike Place
0194fbe77c Attempt to fix inconsintent VT test by preventing a spin 2015-01-05 13:35:02 -07:00
Nicole Thomas
f01ce36e89 Merge pull request #19340 from nmadhok/zpool-unit-test 
Adding unit tests for salt.modules.zpool
 2015-01-05 10:11:46 -07:00
Mike Place
f44e46d080 Adjust batch test 2015-01-05 10:04:15 -07:00
Jayesh
e20076691b adding apache unit test case 2015-01-05 15:06:14 +05:30
Nitin Madhok
c21c7c96c5 Changing return to match zpool list instead of zfs list 2015-01-04 23:48:30 -05:00
nmadhok
2c53cbec1d Replacing zfs with zpool 2015-01-05 10:04:38 +05:30
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07:00
Nicole Thomas
621bcee92d Merge pull request #19273 from jayeshka/extfs_unit_tests 
adding extfs unit test
 2015-01-03 20:20:09 -07:00
Thomas S Hatch
0e9c7ecf28 Merge pull request #19274 from rupeshta/drac_unit_tests 
implimented code for drac module
 2014-12-30 12:10:51 -07:00
Thomas S Hatch
7d3a37d82c Merge pull request #19246 from cachedout/more_cleanup 
More cleanup
 2014-12-30 11:50:12 -07:00
Jayesh
f14cfa9235 adding useradd unit test case. 2014-12-30 12:18:25 +05:30
Jayesh
2928d87cef resolved lint errors in extfs unit test 2014-12-30 11:48:43 +05:30
Mike Place
d9ad877d82 Merge pull request #19286 from cachedout/change_test_enc 
There is no support for ECDSA on OpenSSH < 5.7.
 2014-12-29 19:10:24 -07:00
Mike Place
0f6e94ab6d There is no support for ECDSA on OpenSSH < 5.7. 
This breaks tests on several platforms.
 2014-12-29 17:53:46 -07:00
Thomas S Hatch
4274a338e5 Merge pull request #19265 from jfindlay/log_color 
add color option to console logger
 2014-12-29 15:43:35 -07:00
Mike Place
e4d96cdd37 Merge pull request #19283 from cachedout/check_kmod_ioerror 
Check kmod ioerror
 2014-12-29 12:42:53 -07:00
Mike Place
5b02fd1cc1 Don't patch path existence 2014-12-29 12:41:58 -07:00
Mike Place
845546c009 Holiday lint 2014-12-29 11:27:05 -07:00
Mike Place
e5fb81970d Attempt to fix inconsintent VT test by preventing a spin 2014-12-29 10:26:48 -07:00
Rupesh Tare
722b43116e implimented code for drac module 2014-12-29 19:54:00 +05:30
Jayesh
b71372d4f1 adding extfs unit test 2014-12-29 19:29:41 +05:30
nmadhok
6d8aa5f00e Adding unit tests for salt.modules.zpool 2014-12-28 22:25:03 -05:00
Thomas S Hatch
cd1239a2d7 Merge pull request #19238 from jfindlay/ensure_cmd 
update cmd state and module integration tests
 2014-12-28 13:28:17 -07:00
Thomas S Hatch
763c0f600a Merge pull request #19217 from jayeshka/hosts_unit_tests 
Hosts unit tests
 2014-12-28 13:06:47 -07:00
Thomas S Hatch
845e123c95 Merge pull request #19174 from jayeshka/kmod_unit_tests 
adding kmod module unit tests
 2014-12-28 13:00:18 -07:00