valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
44,084 Commits 24 Branches 182 Tags 341 MiB
4760dc0fb0
Commit Graph

3494 Commits

Author SHA1 Message Date
Colton Myers
4760dc0fb0 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-08 11:45:43 -07:00
Colton Myers
f31128bcc6 Merge pull request #19492 from basepi/shell01 
Set python_shell=false
 2015-01-08 11:45:29 -07:00
Colton Myers
d516dc07a2 Merge pull request #19487 from basepi/merge-forward-2015.2 
Merge forward from 2014.7 to 2015.2
 2015-01-08 11:28:20 -07:00
Colton Myers
522467f546 Fix gem failure 2015-01-08 10:42:55 -07:00
Mike Place
bb0c32e44d Another missed quote 
Conflicts:
	tests/unit/modules/postgres_test.py
 2015-01-08 10:17:39 -07:00
Colton Myers
e7b79de8da Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/ebuild.py
 2015-01-08 09:28:12 -07:00
rallytime
4aa60ce51a Fix linux_acl tests 2015-01-07 20:55:19 -07:00
Erik Johnson
5edba8e55e Add back double-quote 
This is in the actual dig output, I shouldn't have removed it.
 2015-01-07 20:05:43 -06:00
Erik Johnson
98e2e33338 Fix dig tests 
This fixes the dig tests after dig.py was modified to use
python_shell=False.
 2015-01-07 19:59:16 -06:00
Mike Place
6dcd749b2b Merge pull request #19494 from cachedout/fix_failing_postgres 
Some expressions are not so regular
 2015-01-07 16:11:27 -07:00
Mike Place
3830162952 Some expressions are not so regular 2015-01-07 15:53:07 -07:00
Colton Myers
70489c62a7 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/cron.py
	salt/modules/rabbitmq.py
	salt/modules/smf.py
	salt/modules/upstart.py
	salt/modules/useradd.py
	salt/modules/zpool.py
	salt/pillar/git_pillar.py
 2015-01-07 14:49:58 -07:00
Thomas S Hatch
a60ce30962 Merge pull request #19455 from jfindlay/split_uwsgi 
split uwsgi command
 2015-01-07 13:51:45 -07:00
Justin Findlay
d8785de0fd fix uwsgi test 2015-01-07 11:57:44 -07:00
rallytime
4e87557748 --local is not available in older versions of git 
Also adjust the tests:
    subprocess.check_output is only available in python 2.7
 2015-01-07 11:56:43 -07:00
rallytime
fe4fd7a5a3 Use skip_if_binaries_missing decorator 2015-01-07 10:11:26 -07:00
Thomas S Hatch
a0225079a5 Merge pull request #19324 from whiteinge/git_pillar-branch-env-mapping 
Added git_pillar branch to environment mapping
 2015-01-07 10:06:30 -07:00
Pedro Algarvio
06fdee00c8 Merge pull request #19426 from rallytime/merge_forward_fifteen 
Merge forward 2014.7 into 2015.2
 2015-01-07 09:27:40 +00:00
Mike Place
2474cdfde0 Allow for variations in distros in group test 2015-01-06 22:46:28 -07:00
rallytime
80b07f3578 Merge branch '2014.7' into '2015.2' 
Conflicts:
	tests/buildpackage.py
 2015-01-06 20:32:36 -07:00
Nicole Thomas
dbbab28cdc Merge pull request #19425 from s0undt3ch/2014.7 
Ignore the file perms lint check
 2015-01-06 18:22:01 -07:00
Pedro Algarvio
a9eaf187e1 Ignore the file perms lint check 2015-01-07 01:15:56 +00:00
Seth House
e96654744f Added test for git_pillar branch to env mappings 2015-01-06 16:51:58 -07:00
Mike Place
75c067432f Add debugging to jenkins script 2015-01-06 15:29:21 -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
Pedro Algarvio
f377a74fa2 Remove unused script 2015-01-06 17:54:23 +00: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
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
rallytime
57514d824b Fix pylint on 2014.7 branch 2015-01-03 21:44:09 -07: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
Justin Findlay
4748156ed9 update cmdmod integration tests 2014-12-23 13:59:25 -07:00
Nitin Madhok
9f601484bf Fixing unit tests for mdadm 2014-12-23 11:31:58 -07:00
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
 2014-12-22 13:33:53 -07:00
Thomas S Hatch
6579d447ae Merge pull request #19175 from rupeshta/pw_group_unit_tests 
added unit test cases for pw_group module
 2014-12-22 09:37:32 -07:00
Thomas S Hatch
b8b8eb437f Merge pull request #19129 from nmadhok/unit-tests 
Adding unit tests for zfs.exists and zfs.create [WIP]
 2014-12-22 09:17:35 -07:00
Rupesh Tare
14e5ffe078 added unit test cases for pw_group module 2014-12-22 18:22:04 +05:30
Nitin Madhok
d4de045ede Salt modules must be imported after the ensure in syspath call 2014-12-21 11:44:57 -05:00
Nitin Madhok
2ef5edbbca Moving create success together 2014-12-20 13:04:53 -05:00
Nitin Madhok
4a3ba21201 Indentation 2014-12-20 13:02:21 -05:00